You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by pa...@apache.org on 2020/03/18 04:11:53 UTC
[beam] branch master updated: Merge pull request #11149 from
[BEAM-9533] Adding tox cloud tests
This is an automated email from the ASF dual-hosted git repository.
pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new f60c39c Merge pull request #11149 from [BEAM-9533] Adding tox cloud tests
f60c39c is described below
commit f60c39c2add0b483e051ca8935bef8221efc35a3
Author: Pablo <pa...@users.noreply.github.com>
AuthorDate: Tue Mar 17 21:11:33 2020 -0700
Merge pull request #11149 from [BEAM-9533] Adding tox cloud tests
* Adding tox cloud tests
* fix typo
* Fix s3io_test
* Fix installGcpTest
---
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 2 +-
sdks/python/apache_beam/io/aws/s3io_test.py | 4 ++--
sdks/python/test-suites/tox/py2/build.gradle | 8 ++++----
sdks/python/test-suites/tox/py35/build.gradle | 8 ++++----
sdks/python/test-suites/tox/py36/build.gradle | 8 ++++----
sdks/python/test-suites/tox/py37/build.gradle | 8 ++++----
sdks/python/tox.ini | 21 ++++++++-------------
7 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 3651de3..477fb40 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1852,7 +1852,7 @@ class BeamModulePlugin implements Plugin<Project> {
def distTarBall = "${pythonRootDir}/build/apache-beam.tar.gz"
project.exec {
executable 'sh'
- args '-c', ". ${project.ext.envdir}/bin/activate && pip install --retries 10 ${distTarBall}[gcp,test]"
+ args '-c', ". ${project.ext.envdir}/bin/activate && pip install --retries 10 ${distTarBall}[gcp,test,aws]"
}
}
}
diff --git a/sdks/python/apache_beam/io/aws/s3io_test.py b/sdks/python/apache_beam/io/aws/s3io_test.py
index faa66be..711f93a 100644
--- a/sdks/python/apache_beam/io/aws/s3io_test.py
+++ b/sdks/python/apache_beam/io/aws/s3io_test.py
@@ -114,6 +114,7 @@ class TestS3IO(unittest.TestCase):
self.aws.delete(file_name)
def test_last_updated(self):
+ self.skipTest('BEAM-9532 fix issue with s3 last updated')
file_name = self.TEST_DATA_PATH + 'dummy_file'
file_size = 1234
@@ -121,9 +122,8 @@ class TestS3IO(unittest.TestCase):
self.assertTrue(self.aws.exists(file_name))
tolerance = 5 * 60 # 5 mins
- low_bound, high_bound = time.time() - tolerance, time.time() + tolerance
result = self.aws.last_updated(file_name)
- self.assertTrue(low_bound <= result <= high_bound)
+ self.assertAlmostEqual(result, time.time(), delta=tolerance)
# Clean up
self.aws.delete(file_name)
diff --git a/sdks/python/test-suites/tox/py2/build.gradle b/sdks/python/test-suites/tox/py2/build.gradle
index e1f433f..49c4f9e 100644
--- a/sdks/python/test-suites/tox/py2/build.gradle
+++ b/sdks/python/test-suites/tox/py2/build.gradle
@@ -32,8 +32,8 @@ lint.dependsOn lintPy27
toxTask "lintPy27_3", "py27-lint3"
lint.dependsOn lintPy27_3
-toxTask "testPy2Gcp", "py27-gcp"
-test.dependsOn testPy2Gcp
+toxTask "testPy2Cloud", "py27-cloud"
+test.dependsOn testPy2Cloud
toxTask "testPython2", "py27"
test.dependsOn testPython2
@@ -42,11 +42,11 @@ toxTask "testPy2Cython", "py27-cython"
test.dependsOn testPy2Cython
// TODO(BEAM-8954): Remove this once tox uses isolated builds.
-testPy2Cython.mustRunAfter testPython2, testPy2Gcp
+testPy2Cython.mustRunAfter testPython2, testPy2Cloud
toxTask "cover", "cover"
task preCommitPy2() {
dependsOn "testPy2Cython"
- dependsOn "testPy2Gcp"
+ dependsOn "testPy2Cloud"
}
diff --git a/sdks/python/test-suites/tox/py35/build.gradle b/sdks/python/test-suites/tox/py35/build.gradle
index b5da1a2..b760587 100644
--- a/sdks/python/test-suites/tox/py35/build.gradle
+++ b/sdks/python/test-suites/tox/py35/build.gradle
@@ -29,16 +29,16 @@ pythonVersion = '3.5'
toxTask "testPython35", "py35"
test.dependsOn testPython35
-toxTask "testPy35Gcp", "py35-gcp"
-test.dependsOn testPy35Gcp
+toxTask "testPy35Cloud", "py35-cloud"
+test.dependsOn testPy35Cloud
toxTask "testPy35Cython", "py35-cython"
test.dependsOn testPy35Cython
// TODO(BEAM-8954): Remove this once tox uses isolated builds.
-testPy35Cython.mustRunAfter testPython35, testPy35Gcp
+testPy35Cython.mustRunAfter testPython35, testPy35Cloud
task preCommitPy35() {
- dependsOn "testPy35Gcp"
+ dependsOn "testPy35Cloud"
dependsOn "testPy35Cython"
}
diff --git a/sdks/python/test-suites/tox/py36/build.gradle b/sdks/python/test-suites/tox/py36/build.gradle
index 65d2767..db976f0 100644
--- a/sdks/python/test-suites/tox/py36/build.gradle
+++ b/sdks/python/test-suites/tox/py36/build.gradle
@@ -29,16 +29,16 @@ pythonVersion = '3.6'
toxTask "testPython36", "py36"
test.dependsOn testPython36
-toxTask "testPy36Gcp", "py36-gcp"
-test.dependsOn testPy36Gcp
+toxTask "testPy36Cloud", "py36-cloud"
+test.dependsOn testPy36Cloud
toxTask "testPy36Cython", "py36-cython"
test.dependsOn testPy36Cython
// TODO(BEAM-8954): Remove this once tox uses isolated builds.
-testPy36Cython.mustRunAfter testPython36, testPy36Gcp
+testPy36Cython.mustRunAfter testPython36, testPy36Cloud
task preCommitPy36() {
- dependsOn "testPy36Gcp"
+ dependsOn "testPy36Cloud"
dependsOn "testPy36Cython"
}
diff --git a/sdks/python/test-suites/tox/py37/build.gradle b/sdks/python/test-suites/tox/py37/build.gradle
index 39c547c..7be7f8c 100644
--- a/sdks/python/test-suites/tox/py37/build.gradle
+++ b/sdks/python/test-suites/tox/py37/build.gradle
@@ -41,16 +41,16 @@ check.dependsOn formatter
toxTask "testPython37", "py37"
test.dependsOn testPython37
-toxTask "testPy37Gcp", "py37-gcp"
-test.dependsOn testPy37Gcp
+toxTask "testPy37Cloud", "py37-cloud"
+test.dependsOn testPy37Cloud
toxTask "testPy37Cython", "py37-cython"
test.dependsOn testPy37Cython
// TODO(BEAM-8954): Remove this once tox uses isolated builds.
-testPy37Cython.mustRunAfter testPython37, testPy37Gcp
+testPy37Cython.mustRunAfter testPython37, testPy37Cloud
task preCommitPy37() {
- dependsOn "testPy37Gcp"
+ dependsOn "testPy37Cloud"
dependsOn "testPy37Cython"
}
diff --git a/sdks/python/tox.ini b/sdks/python/tox.ini
index 12acec3..d9e3445 100644
--- a/sdks/python/tox.ini
+++ b/sdks/python/tox.ini
@@ -128,8 +128,8 @@ commands =
python apache_beam/examples/complete/autocomplete_test.py
{toxinidir}/scripts/run_pytest.sh {envname} "{posargs}"
-[testenv:py27-gcp]
-extras = test,gcp
+[testenv:py27-cloud]
+extras = test,gcp,aws
commands =
python apache_beam/examples/complete/autocomplete_test.py
{toxinidir}/scripts/run_pytest.sh {envname} "{posargs}"
@@ -140,23 +140,18 @@ commands =
pytest -o junit_suite_name={envname}_v1 --junitxml=pytest_{envname}_v1.xml apache_beam/io/gcp/datastore/v1
pytest -o junit_suite_name={envname}_v1new --junitxml=pytest_{envname}_v1new.xml apache_beam/io/gcp/datastore/v1new
-[testenv:py35-gcp]
-extras = test,gcp
+[testenv:py35-cloud]
+extras = test,gcp,aws
commands =
{toxinidir}/scripts/run_pytest.sh {envname} "{posargs}"
-[testenv:py36-gcp]
-extras = test,gcp,interactive
+[testenv:py36-cloud]
+extras = test,gcp,interactive,aws
commands =
{toxinidir}/scripts/run_pytest.sh {envname} "{posargs}"
-[testenv:py37-gcp]
-extras = test,gcp,interactive
-commands =
- {toxinidir}/scripts/run_pytest.sh {envname} "{posargs}"
-
-[testenv:py37-aws]
-extras = test,aws
+[testenv:py37-cloud]
+extras = test,gcp,interactive,aws
commands =
{toxinidir}/scripts/run_pytest.sh {envname} "{posargs}"