Skip to content
This repository was archived by the owner on Oct 10, 2020. It is now read-only.

Make test_display.sh pass again#173

Merged
rhatdan merged 1 commit intoprojectatomic:masterfrom
jlebon:fix-integration-tests
Sep 24, 2015
Merged

Make test_display.sh pass again#173
rhatdan merged 1 commit intoprojectatomic:masterfrom
jlebon:fix-integration-tests

Conversation

@jlebon
Copy link
Contributor

@jlebon jlebon commented Sep 24, 2015

This patch makes test_display.sh pass. They are mostly tweaks to account
for the following:

  • Account for commit 7858957, which removes {CONF,LOG,DATA}DIR from the
    target environment.
  • Account for commit ae931d0, which removes those default bind mounts.
  • Fix a few mismatches between the labels in the Dockerfile vs the
    expected output in the test script.

And with that, all tests (should) pass!

This patch makes test_display.sh pass. They are mostly tweaks to account
for the following:
- Account for commit 7858957, which removes {CONF,LOG,DATA}DIR from the
  target environment.
- Account for commit ae931d0, which removes those default bind mounts.
- Fix a few mismatches between the labels in the Dockerfile vs the
  expected output in the test script.

And with that, all tests (should) pass!
@rhatdan
Copy link
Member

rhatdan commented Sep 24, 2015

Thanks, sorry I missed this. LGTM

rhatdan added a commit that referenced this pull request Sep 24, 2015
@rhatdan rhatdan merged commit e1680aa into projectatomic:master Sep 24, 2015
@jlebon jlebon deleted the fix-integration-tests branch September 24, 2015 21:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants