diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2016-10-10 10:26:22 -0800 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2016-10-10 11:35:00 -0700 |
| commit | edaf3b342db4afa1c872da541fb0ac176a4e8ef9 (patch) | |
| tree | b976073fdc2a6404cbdc3ee323a637e2e1b16846 /tensorflow/tools/gcs_test | |
| parent | d1518c26530daaee854e73365bd7dfb9a2f69dbd (diff) | |
Merge changes from github.
Change: 135698415
Diffstat (limited to 'tensorflow/tools/gcs_test')
| -rw-r--r-- | tensorflow/tools/gcs_test/Dockerfile | 5 | ||||
| -rw-r--r-- | tensorflow/tools/gcs_test/python/gcs_smoke.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tensorflow/tools/gcs_test/Dockerfile b/tensorflow/tools/gcs_test/Dockerfile index aebad1c5a7..0abe3d6304 100644 --- a/tensorflow/tools/gcs_test/Dockerfile +++ b/tensorflow/tools/gcs_test/Dockerfile @@ -1,10 +1,11 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 MAINTAINER Shanqing Cai <cais@google.com> RUN apt-get update RUN apt-get install -y --no-install-recommends \ curl \ + libcurl4-openssl-dev \ python \ python-numpy \ python-pip @@ -16,7 +17,7 @@ RUN ./install_google_cloud_sdk.bash --disable-prompts --install-dir=/var/gcloud # Install nightly TensorFlow pip RUN pip install \ - https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.10.0-cp27-none-linux_x86_64.whl + https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.11.0rc0-cp27-none-linux_x86_64.whl # Copy test files RUN mkdir -p /gcs-smoke/python diff --git a/tensorflow/tools/gcs_test/python/gcs_smoke.py b/tensorflow/tools/gcs_test/python/gcs_smoke.py index 90d32dc149..5db03afb4d 100644 --- a/tensorflow/tools/gcs_test/python/gcs_smoke.py +++ b/tensorflow/tools/gcs_test/python/gcs_smoke.py @@ -107,6 +107,6 @@ if __name__ == "__main__": print("FAIL: Failed to catch the expected OutOfRangeError while " "reading one more record than is available") sys.exit(1) - except tf.python.framework.errors.OutOfRangeError: + except tf.errors.OutOfRangeError: print("Successfully caught the expected OutOfRangeError while " "reading one more record than is available") |