Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
8bdd90a5
Commit
8bdd90a5
authored
Feb 25, 2015
by
Christine Lytwynec
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7037 from edx/clytwynec/flaky_test_decorator
Clytwynec/flaky test decorator
parents
c877c604
d14c7cf1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
10 deletions
+12
-10
common/test/acceptance/tests/studio/test_studio_library_container.py
+2
-1
pavelib/utils/test/suites/nose_suite.py
+1
-1
requirements/edx/github.txt
+1
-0
scripts/all-tests.sh
+8
-8
No files found.
common/test/acceptance/tests/studio/test_studio_library_container.py
View file @
8bdd90a5
...
...
@@ -2,6 +2,7 @@
Acceptance tests for Library Content in LMS
"""
import
ddt
from
flaky
import
flaky
import
textwrap
from
unittest
import
skip
...
...
@@ -149,7 +150,7 @@ class StudioLibraryContainerTest(StudioLibraryTest, UniqueCourseTest):
self
.
assertTrue
(
library_container
.
has_validation_error
)
self
.
assertIn
(
expected_text
,
library_container
.
validation_error_text
)
@
skip
(
"TE-745 StudioLibraryContainerTest test_out_of_date_message fails intemittently"
)
@
flaky
# TODO fix this, see TE-745
def
test_out_of_date_message
(
self
):
"""
Scenario: Given I have a library, a course and library content xblock in a course
...
...
pavelib/utils/test/suites/nose_suite.py
View file @
8bdd90a5
...
...
@@ -161,7 +161,7 @@ class LibTestSuite(NoseTestSuite):
def
cmd
(
self
):
cmd
=
(
"nosetests --id-file={test_ids} {test_id} {test_opts} "
"--with-xunit --xunit-file={xunit_report} {extra}"
"--with-xunit --xunit-file={xunit_report} {extra}
"
"--verbosity={verbosity}"
.
format
(
test_ids
=
self
.
test_ids
,
test_id
=
self
.
test_id
,
...
...
requirements/edx/github.txt
View file @
8bdd90a5
...
...
@@ -11,6 +11,7 @@
-e git+https://github.com/edx/django-pipeline.git@88ec8a011e481918fdc9d2682d4017c835acd8be#egg=django-pipeline
-e git+https://github.com/edx/django-wiki.git@cd0b2b31997afccde519fe5b3365e61a9edb143f#egg=django-wiki
-e git+https://github.com/edx/django-oauth2-provider.git@0.2.7-fork-edx-2#egg=django-oauth2-provider
-e git+https://github.com/clytwynec/flaky.git@clytwynec/fix-false-success-results#egg=flaky
-e git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=mongodb_proxy
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
-e git+https://github.com/eventbrite/zendesk.git@d53fe0e81b623f084e91776bcf6369f8b7b63879#egg=zendesk
...
...
scripts/all-tests.sh
View file @
8bdd90a5
...
...
@@ -95,17 +95,17 @@ END
"unit"
)
case
"
$SHARD
"
in
"lms"
)
paver test_system
-s
lms
paver test_system
-s
lms
--extra_args
=
"--with-flaky"
paver coverage
;;
"cms-js-commonlib"
)
paver test_system
-s
cms
paver test_system
-s
cms
--extra_args
=
"--with-flaky"
paver test_js
--coverage
--skip_clean
paver test_lib
--skip_clean
paver test_lib
--skip_clean
--extra_args
=
"--with-flaky"
paver coverage
;;
*
)
paver
test
paver
test
--extra_args
=
"--with-flaky"
paver coverage
;;
esac
...
...
@@ -162,19 +162,19 @@ END
;;
"1"
)
paver test_bokchoy
--extra_args
=
"-a shard_1"
paver test_bokchoy
--extra_args
=
"-a shard_1
--with-flaky
"
;;
"2"
)
paver test_bokchoy
--extra_args
=
"-a 'shard_2'"
paver test_bokchoy
--extra_args
=
"-a 'shard_2'
--with-flaky
"
;;
"3"
)
paver test_bokchoy
--extra_args
=
"-a 'shard_3'"
paver test_bokchoy
--extra_args
=
"-a 'shard_3'
--with-flaky
"
;;
"4"
)
paver test_bokchoy
--extra_args
=
"-a shard_1=False,shard_2=False,shard_3=False"
paver test_bokchoy
--extra_args
=
"-a shard_1=False,shard_2=False,shard_3=False
--with-flaky
"
;;
# Default case because if we later define another bok-choy shard on Jenkins
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment