← Back to branch summary

~ubuntu-branches/ubuntu/saucy/swift/saucy-updates

« back to all changes in this revision

Viewing changes to test/probe/test_account_failures.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-04-12 12:05:29 UTC
  • Revision ID: package-import@ubuntu.com-20120412120529-bvwxjpqyb4froqoh
Tags: 1.4.8-0ubuntu2
debian/patches/fix-ubuntu-unittests.patch: Refreshed
to fix testsuite failures. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/probe/test_account_failures.py
15
15
# limitations under the License.
16
16
 
17
17
import unittest
 
18
from nose import SkipTest
18
19
from os import kill
19
20
from signal import SIGTERM
20
21
from subprocess import Popen
21
22
from time import sleep
22
23
 
23
 
from nose import SkipTest
24
 
 
25
24
from swift.common import client, direct_client
26
25
from test.probe.common import get_to_final_state, kill_pids, reset_environment
27
26
 
30
29
 
31
30
    def setUp(self):
32
31
        try:
33
 
            self.pids, self.port2server, self.account_ring, self.container_ring, \
34
 
                self.object_ring, self.url, self.token, self.account = \
35
 
                    reset_environment()
 
32
                self.pids, self.port2server, self.account_ring, self.container_ring, \
 
33
                        self.object_ring, self.url, self.token, self.account = \
 
34
                        reset_environment()
36
35
        except:
37
 
             raise SkipTest
 
36
                raise SkipTest
38
37
 
39
38
    def tearDown(self):
40
39
        kill_pids(self.pids)