Skip to content

Commit f36c430

Browse files
committed
Merge pull request rackspace#247 from jamiehannaford/script-fix
Removing race conditions from acceptance tests
2 parents 4e2a178 + 1c5f553 commit f36c430

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

acceptance/README.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ to a remote API.
1212
1313
### Step 1. Set environment variables
1414

15-
A lot of tests rely on environment variables for configuration - so you will need
15+
A lot of tests rely on environment variables for configuration - so you will need
1616
to set them before running the suite. If you're testing against pure OpenStack APIs,
17-
you can download a file that contains all of these variables for you: just visit
18-
the `project/access_and_security` page in your control panel and click the "Download
19-
OpenStack RC File" button at the top right. For all other providers, you will need
17+
you can download a file that contains all of these variables for you: just visit
18+
the `project/access_and_security` page in your control panel and click the "Download
19+
OpenStack RC File" button at the top right. For all other providers, you will need
2020
to set them manually.
2121

2222
#### Authentication
@@ -45,12 +45,8 @@ to set them manually.
4545

4646
### 2. Run the test suite
4747

48-
From any directory, run:
48+
From the root directory, run:
4949

5050
```
51-
go test -v -tags acceptance github.com/rackspace/gophercloud/...
51+
./script/acceptancetest
5252
```
53-
54-
Alternatively, you can execute the above from your nested git folder (i.e. the
55-
workspace visible when browsing the Github repository) by replacing
56-
`github.com/rackspace/gophercloud/...` with `./...`

script/acceptancetest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
#
33
# Run the acceptance tests.
44

5-
exec go test -tags 'acceptance fixtures' ./acceptance/... $@
5+
exec go test -v -p=1 -tags 'acceptance fixtures' ./acceptance/... $@

0 commit comments

Comments
 (0)