merge of '178cf4e5311729ac333305676b5ad2aa35a7ca71'

and 'da943d19b66326d6a44506dad61363238c96ca37'

Monotone-Parent: 178cf4e5311729ac333305676b5ad2aa35a7ca71
Monotone-Parent: da943d19b66326d6a44506dad61363238c96ca37
Monotone-Revision: da71a89c98fc467cc01710a03c0654176bc8b0fe

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2011-06-27T22:44:21
Monotone-Branch: ca.inverse.sogo

Tests/Integration/sogoLogin.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 from config import hostname, port, username, password
+import sys, getopt
 import webdavlib
 import urllib
 import urllib2
@@ -14,10 +15,9 @@ def getAuthCookie(hostname, port, username, password) :
 	urllib2.install_opener(opener)
 
 	creds = urllib.urlencode([("userName",username), ("password", password)])
-	req = urllib2.Request("http://%s/SOGo/connect" % hostname, creds)
+	req = urllib2.Request("http://%s:%s/SOGo/connect" % (hostname, port), creds)
 	
 	fd = urllib2.urlopen(req)
-	#print fd.info()
 	
 	for cookie in cjar :
 	    if cookie.name == "0xHIGHFLYxSOGo":
@@ -25,5 +25,32 @@ def getAuthCookie(hostname, port, username, password) :
 	      break
 
 	return "0xHIGHFLYxSOGo="+authinfo
+
+def usage() :
+	msg ="""Usage:
+%s [-h] [-H | --host=hostname] [-p|--passwd=password] \
+[-P|--port=port] [-u|--user=username]\n""" % sys.argv[0]
+
+	sys.stderr.write(msg);
+
 if __name__ == "__main__" :
-	getAuthCookie()
+	try:
+	    opts, args = getopt.getopt (sys.argv[1:], "hH:p:P:u:", \
+	                            ("host=", "passwd=", "port=", "user="));
+	except getopt.GetoptError:
+	    usage()
+	    exit(1)
+	for o, v in opts :
+	    if o == "-h" :
+	        usage()
+	        exit(1)
+	    elif o == "-H" or o == "--host" :
+	        hostname = v
+	    elif o == "-p" or o == "--passwd" :
+	        password = v
+	    elif o == "-P" or o == "--port" :
+	        port = v
+	    elif o == "-u" or o == "--user" :
+	        username = v
+
+	print getAuthCookie(hostname, port, username, password)