FF-373 #comment check is part of connection

4dn-dcic · Dec 7, 2016 · 5f0f80a · 5f0f80a
1 parent 3efebd6
commit 5f0f80a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 deletions.
diff --git a/tests/test_fdnDCIC.py b/tests/test_fdnDCIC.py
@@ -5,15 +5,10 @@
 
 keypairs = {
             "default":
-            {"server": "https://test.FDN.org",
-             "key": "keystring",
-             "secret": "secretstring"
-             },
-            "wrong_key":
             {"server": "https://data.4dnucleome.org/",
              "key": "keystring",
              "secret": "secretstring"
-             },
+             }
             }
 
 
@@ -47,9 +42,9 @@ def test_connection():
 
 
 def test_test_connection_fail():
-    key = fdnDCIC.FDN_Key(keypairs, "wrong_key")
+    key = fdnDCIC.FDN_Key(keypairs, "default")
     connection = fdnDCIC.FDN_Connection(key)
-    assert fdnDCIC.test_Connection_fail(connection) is True
+    assert connection.check is False
 
 
 def test_FDN_url():
@@ -60,10 +55,10 @@ def test_FDN_url():
                         ["trial", "object"],
                         ["trial?some", "object"]
                         ]
-    expected_url = ["https://test.FDN.org/trial?limit=all",
-                    "https://test.FDN.org/trial?some&limit=all",
-                    "https://test.FDN.org/trial?limit=all&frame=object",
-                    "https://test.FDN.org/trial?some&limit=all&frame=object"
+    expected_url = ["https://data.4dnucleome.org/trial?limit=all",
+                    "https://data.4dnucleome.org/trial?some&limit=all",
+                    "https://data.4dnucleome.org/trial?limit=all&frame=object",
+                    "https://data.4dnucleome.org/trial?some&limit=all&frame=object"
                     ]
     for n, case in enumerate(test_objid_frame):
         t_url = fdnDCIC.FDN_url(case[0], connection, case[1])

diff --git a/wranglertools/fdnDCIC.py b/wranglertools/fdnDCIC.py
@@ -35,12 +35,12 @@ def __init__(self, key):
             self.auth = ()
         else:
             self.auth = (key.authid, key.authpw)
-
-
-def test_Connection_fail(connection):
-    r = requests.get(connection.server, auth=connection.auth)
-    if r.status_code != 200:
-        return True
+        # check connection and find user uuid
+        me_page = self.server + 'me'
+        r = requests.get(me_page, auth=self.auth)
+        self.check = False
+        if r.status_code == 200:
+            self.check = True
 
 
 class FDN_Schema(object):

diff --git a/wranglertools/get_field_info.py b/wranglertools/get_field_info.py
@@ -221,7 +221,7 @@ def main():  # pragma: no cover
     key = fdnDCIC.FDN_Key(args.keyfile, args.key)
     connection = fdnDCIC.FDN_Connection(key)
     # test connection
-    if fdnDCIC.test_Connection_fail(connection):
+    if not connection.check:
         print("CONNECTION ERROR: Please check your keys.")
         return
     fields = get_uploadable_fields(connection, args.type,

diff --git a/wranglertools/import_data.py b/wranglertools/import_data.py
@@ -603,7 +603,7 @@ def main():  # pragma: no cover
     connection = fdnDCIC.FDN_Connection(key)
     print("Running on {server}".format(server=connection.server))
     # test connection
-    if fdnDCIC.test_Connection_fail(connection):
+    if not connection.check:
         print("CONNECTION ERROR: Please check your keys.")
         return
     # check input file (xls)