Fixes for probe tests

Updated the imports and added a head_account to the "is the cluster
started yet?" checks. Hopefully this fixes the notorious timing
issues of these tests where auth answers requests just a bit before
the rest of the cluster is ready.

Fixes bug 1014931

Change-Id: Iea1d62db2317560371da49af5e94a0279b646294

test/probe/common.py

@@ -19,7 +19,7 @@ from subprocess import call, Popen
 from time import sleep
 
 from swift.common.bufferedhttp import http_connect_raw as http_connect
-from swiftclient import get_auth
+from swiftclient import get_auth, head_account
 from swift.common.ring import Ring
 
 
@@ -54,6 +54,7 @@ def reset_environment():
                 url, token = get_auth('http://127.0.0.1:8080/auth/v1.0',
                                       'test:tester', 'testing')
                 account = url.split('/')[-1]
+                head_account(url, token)
                 break
             except Exception, err:
                 if attempt > 9:

test/probe/test_account_failures.py

@@ -20,7 +20,8 @@ from signal import SIGTERM
 from subprocess import Popen
 from time import sleep
 
-from swift.common import client, direct_client
+from swiftclient import client
+from swift.common import direct_client
 from test.probe.common import get_to_final_state, kill_pids, reset_environment
 
 

test/probe/test_container_failures.py

@@ -24,7 +24,8 @@ from uuid import uuid4
 import eventlet
 import sqlite3
 
-from swift.common import client, direct_client
+from swiftclient import client
+from swift.common import direct_client
 from swift.common.utils import hash_path, readconf
 
 from test.probe.common import get_to_final_state, kill_pids, reset_environment

test/probe/test_object_async_update.py

@@ -21,7 +21,8 @@ from subprocess import Popen
 from time import sleep
 from uuid import uuid4
 
-from swift.common import client, direct_client
+from swiftclient import client
+from swift.common import direct_client
 
 from test.probe.common import kill_pids, reset_environment
 

test/probe/test_object_failures.py

@@ -18,7 +18,8 @@ import unittest
 import os
 from uuid import uuid4
 
-from swift.common import client, direct_client
+from swiftclient import client
+from swift.common import direct_client
 from swift.common.utils import hash_path, readconf
 from swift.obj.server import write_metadata, read_metadata
 from test.probe.common import kill_pids, reset_environment

test/probe/test_object_handoff.py

@@ -21,7 +21,8 @@ from subprocess import call, Popen
 from time import sleep
 from uuid import uuid4
 
-from swift.common import client, direct_client
+from swiftclient import client
+from swift.common import direct_client
 
 from test.probe.common import kill_pids, reset_environment
 

test/probe/test_running_with_each_type_down.py

@@ -20,7 +20,7 @@ from signal import SIGTERM
 from subprocess import Popen
 from time import sleep
 
-from swift.common import client
+from swiftclient import client
 
 from test.probe.common import get_to_final_state, kill_pids, reset_environment