← Back to branch summary

~ttx/swift/release-1.4.2

« back to all changes in this revision

Viewing changes to test/probe/test_account_failures.py

  • Committer: Tarmac
  • Author(s): gholt, FUJITA Tomonori, John Dickinson, David Goetz, John Dickinson, Joe Arnold, Scott Simpson, joe at cloudscaling, Thierry Carrez
  • Date: 2011-07-26 09:08:37 UTC
  • mfrom: (305.1.1 milestone-proposed)
  • Revision ID: tarmac-20110726090837-fwlvja8dnk7nkppw
Merge 1.4.2 development from trunk (rev331)

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/probe/test_account_failures.py
20
20
from subprocess import Popen
21
21
from time import sleep
22
22
 
23
 
from swift.common import client
 
23
from swift.common import client, direct_client
24
24
from test.probe.common import get_to_final_state, kill_pids, reset_environment
25
25
 
26
26
 
146
146
        sleep(2)
147
147
        # This is the earlier counts and bytes because the first node doesn't
148
148
        # have the newest udpates yet.
149
 
        headers, containers = client.get_account(self.url, self.token)
 
149
        headers, containers = \
 
150
            direct_client.direct_get_account(anodes[0], apart, self.account)
150
151
        self.assertEquals(headers['x-account-container-count'], '2')
151
152
        self.assertEquals(headers['x-account-object-count'], '1')
152
153
        self.assertEquals(headers['x-account-bytes-used'], '4')
167
168
        self.assert_(found2)
168
169
 
169
170
        get_to_final_state()
170
 
        headers, containers = client.get_account(self.url, self.token)
 
171
        headers, containers = \
 
172
            direct_client.direct_get_account(anodes[0], apart, self.account)
171
173
        self.assertEquals(headers['x-account-container-count'], '1')
172
174
        self.assertEquals(headers['x-account-object-count'], '2')
173
175
        self.assertEquals(headers['x-account-bytes-used'], '9')