Fix for broken unit tests

Author: Farhan Nomani

Diff for: test/HPE3ParClient_base.py

@@ -125,12 +125,8 @@ def setUp(self, withSSH=False, withFilePersona=False):
             except Exception:
                 pass
 
-            time.sleep(5)
-            if self.withFilePersona:
-		pass
-                #self.cl = file_client.HPE3ParFilePersonaClient(self.flask_url)
-            else:
-                self.cl = client.HPE3ParClient(self.flask_url)
+            time.sleep(1)
+            self.cl = client.HPE3ParClient(self.flask_url)
 
             if self.withSSH:
 
@@ -209,10 +205,8 @@ def setUp(self, withSSH=False, withFilePersona=False):
 
         if not self.port:
             ports = self.cl.getPorts()
-	    print "hello"
-	    print vars(self.cl)
-	    for port in ports:
-	        print port.mode
+        for port in ports:
+            #print port.mode
             ports = [port for port in ports if port.linkState == 4 and  ( port.device is not None or not port.device) and port.mode == 2]
             self.port = ports[0].port_pos
 

Diff for: test/HPE3ParMockServer_flask.py

@@ -1697,9 +1697,7 @@ def get_overall_capacity():
 @app.route('/api', methods=['GET'])
 def get_version():
     debugRequest(flask.request)
-    version = {'major': 1,
-               'minor': 3,
-               'build': 30201256}
+    version = {"major": 1, "minor": 6, "revision": 3, "build": 30301418}
     resp = flask.make_response(json.dumps(version), 200)
     return resp
 

Diff for: test/config.ini

@@ -1,29 +1 @@
-[TEST]
-flask_url=http://0.0.0.0:5001/api/v1
-#flask_url=http://localhost:5001/api/v1
-user=USERNAME
-pass=PASSWORD
-unit=true
-debug=false
-3par_url=http://10.10.##.##:8008/api/v1
-cpg_ldlayout_ha=3
-disk_type=3
-domain=UNIT_TEST_DOMAIN
-missing_key_policy=AutoAddPolicy
-# skip_file_persona: Set to true when using an array without File Persona
-skip_file_persona=true
-# To speed up File Persona tests, specify an existing FPG to use.
-# fpg=unit_test_fpg
-# To run remote copy tests against live arrays, set this to true
-run_remote_copy=false
-
-# If run_remote_copy is set to true, remote copy tests will be run. For this
-# to work as intended, a secondary array must be specified in the below
-# section. The URL, username, password, and the 3PAR target name are required
-# entries. The domain specified in the TEST config group must also be present
-# on the secondary array.
-[TEST_REMOTE_COPY]
-3par_url=http://10.10.##.##:8008/api/v1
-user=USERNAME
-pass=PASSWORD
-target_name=TARGET
+../config.ini