Merge branch 'master' of https://code.grnet.gr/git/pithos

diff --git a/tools/lib/util.py b/tools/lib/util.py
index 7ad78f4..0b3a485 100644 (file)
--- a/tools/lib/util.py
+++ b/tools/lib/util.py
@@ -7,10 +7,16 @@ DEFAULT_USER = 'test'
 DEFAULT_AUTH = '0000'
 
 def get_user():
-    return DEFAULT_USER
+    try:
+        return os.environ['PITHOS_USER']
+    except KeyError:
+        return DEFAULT_USER
 
 def get_auth():
-    return DEFAULT_AUTH
+    try:
+        return os.environ['PITHOS_AUTH']
+    except KeyError:
+        return DEFAULT_AUTH
 
 def get_server():
     try:

diff --git a/tools/test b/tools/test
index 5e97e92..ff9e89c 100755 (executable)
--- a/tools/test
+++ b/tools/test
@@ -2083,4 +2083,5 @@ o_names = ['kate.jpg',
            'photos/me.jpg']
 
 if __name__ == "__main__":
-    unittest.main()
+    if get_user() == 'test':
+        unittest.main()