Skip to content

Commit

Permalink
Add remove command to travis.yml to remove problematic file from fail…
Browse files Browse the repository at this point in the history
…ing CI target
  • Loading branch information
Chris Livingston committed Jan 30, 2018
1 parent 8ac832b commit 59164c1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,8 @@ matrix:
# Pants will pick up oraclejdk6 from `packages` above.
- sudo rm -rf /usr/lib/jvm/java-1.6.0-openjdk-amd64
- sudo rm -rf /usr/lib/jvm/java-6-openjdk-amd64
- jdk_switcher use oraclejdk8
- jdk_switcher use oraclejdk
- sudo rm ~/.cache/pants/python_cache/requirements/CPython-2.7.14/superhello*
env:
- SHARD="Python integration tests for pants - shard 1"
script:
Expand All @@ -271,6 +272,7 @@ matrix:
- sudo rm -rf /usr/lib/jvm/java-1.6.0-openjdk-amd64
- sudo rm -rf /usr/lib/jvm/java-6-openjdk-amd64
- jdk_switcher use oraclejdk8
- sudo rm ~/.cache/pants/python_cache/requirements/CPython-2.7.14/superhello*
env:
- SHARD="Python integration tests for pants - shard 2"
script:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ def test_pants_test(self):
self.assert_success(pants_run)

def test_with_install_requires(self):
command=['clean-all', 'run', '{}:main_with_no_conflict'.format(self.superhello_install_requires)]
command=['run', '{}:main_with_no_conflict'.format(self.superhello_install_requires)]
pants_run = self.run_pants(command=command)
self.assert_success(pants_run)
self.assertIn('United States', pants_run.stdout_data)
command=['clean-all', 'binary', '{}:main_with_no_conflict'.format(self.superhello_install_requires)]
command=['binary', '{}:main_with_no_conflict'.format(self.superhello_install_requires)]
pants_run = self.run_pants(command=command)
self.assert_success(pants_run)
pex = os.path.join(get_buildroot(), 'dist', 'main_with_no_conflict.pex')
Expand All @@ -58,12 +58,12 @@ def test_with_install_requires(self):
os.remove(pex)

def test_with_conflicting_transitive_deps(self):
command=['clean-all', 'run', '{}:main_with_conflicting_dep'.format(self.superhello_install_requires)]
command=['run', '{}:main_with_conflicting_dep'.format(self.superhello_install_requires)]
pants_run = self.run_pants(command=command)
self.assert_failure(pants_run)
self.assertIn('pycountry', pants_run.stderr_data)
self.assertIn('superhello', pants_run.stderr_data)
command=['clean-all', 'binary', '{}:main_with_conflicting_dep'.format(self.superhello_install_requires)]
command=['binary', '{}:main_with_conflicting_dep'.format(self.superhello_install_requires)]
pants_run = self.run_pants(command=command)
self.assert_failure(pants_run)
self.assertIn('pycountry', pants_run.stderr_data)
Expand Down

0 comments on commit 59164c1

Please sign in to comment.