Skip to content

Commit

Permalink
Remove references to Travis.ci
Browse files Browse the repository at this point in the history
  • Loading branch information
cpennington committed Dec 2, 2020
1 parent 75765f8 commit edba494
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 68 deletions.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v2
- name: Start container
run: |
docker-compose -f ./.travis/docker-compose-travis.yml up -d
docker-compose -f ./.ci/docker-compose-ci.yml up -d
- name: Install dependencies
run: |
docker exec -t ecommerce_testing bash -c "
Expand All @@ -35,15 +35,15 @@ jobs:
"
- name: Run tests
run: |
docker exec -t -e TRAVIS=1 ecommerce_testing bash -c "
docker exec -t -e CI=1 ecommerce_testing bash -c "
cd /edx/app/ecommerce/ecommerce/ &&
PATH=\$PATH:/edx/app/ecommerce/nodeenvs/ecommerce/bin:/snap/bin
DJANGO_ENV=${{ matrix.django-env }} make ${{ matrix.targets }}
"
- name: Run coverage
if: matrix.testname == 'test-python'
run: |
docker exec ecommerce_testing /edx/app/ecommerce/ecommerce/.travis/run_coverage.sh
docker exec ecommerce_testing /edx/app/ecommerce/ecommerce/.ci/run_coverage.sh
- name: Setup Python
if: matrix.testname == 'test-python'
uses: actions/setup-python@v2
Expand Down
58 changes: 0 additions & 58 deletions .travis.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
edX E-Commerce Service |Travis|_ |Codecov|_
edX E-Commerce Service |CI|_ |Codecov|_
============================================
.. |Travis| image:: https://travis-ci.com/edx/ecommerce.svg?branch=master
.. _Travis: https://travis-ci.com/edx/ecommerce
.. |CI| image:: https://github.com/edx/ecommerce/workflows/CI/badge.svg
.. _CI: https://github.com/edx/ecommerce/actions?query=workflow%3ACI

.. |Codecov| image:: http://codecov.io/github/edx/ecommerce/coverage.svg?branch=master
.. _Codecov: http://codecov.io/github/edx/ecommerce?branch=master
Expand Down
4 changes: 2 additions & 2 deletions ecommerce/extensions/dashboard/orders/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def assert_retry_fulfillment_failed(self, order_number):
class OrderListViewBrowserTests(OrderViewTestsMixin, RefundTestMixin, OrderViewBrowserTestBase):
path = reverse('dashboard:order-list')

@skipIf(os.environ.get('TRAVIS'), 'This test consistently fails on Travis.')
@skipIf(os.environ.get('CI'), 'This test consistently fails on CI.')
@override_settings(FULFILLMENT_MODULES=['ecommerce.extensions.fulfillment.tests.modules.FakeFulfillmentModule', ])
def test_retry_fulfillment(self):
"""
Expand Down Expand Up @@ -243,7 +243,7 @@ def test_create_refund_error(self):

class OrderDetailViewBrowserTests(OrderViewTestsMixin, RefundTestMixin, OrderViewBrowserTestBase):

@skipIf(os.environ.get('TRAVIS'), 'This test consistently fails on Travis.')
@skipIf(os.environ.get('CI'), 'This test consistently fails on CI.')
@override_settings(FULFILLMENT_MODULES=['ecommerce.extensions.fulfillment.tests.modules.FakeFulfillmentModule', ])
def test_retry_fulfillment(self):
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def test_processing_success(self, approve):
# Verify that an alert is displayed.
self.assert_alert_displayed('alert-success', 'Refund {} has been processed.'.format(self.refund.id))

@skip("This test is flaky in Travis. Move to e2e and re-enable under ticket XCOM-342.")
@skip("This test is flaky in CI. Move to e2e and re-enable under ticket XCOM-342.")
@ddt.data(True, False)
def test_processing_failure(self, approve):
"""
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ passenv =
SELENIUM_PLATFORM
SELENIUM_PORT
SELENIUM_VERSION
TRAVIS
CI
setenv =
tests: DJANGO_SETTINGS_MODULE = ecommerce.settings.test
acceptance: DJANGO_SETTINGS_MODULE = ecommerce.settings.test
Expand Down

0 comments on commit edba494

Please sign in to comment.