Merge branch 'master' into pg_constraint

cmu-db · Jul 3, 2018 · 25a3d0c · 25a3d0c
2 parents fe5697e + c949481
commit 25a3d0c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/test/brain/tensorflow_test.cpp b/test/brain/tensorflow_test.cpp
@@ -28,7 +28,8 @@ namespace test {
 
 class TensorflowTests : public PelotonTest {};
 
-TEST_F(TensorflowTests, BasicTFTest) {
+// TODO: Enable this test once tensorflow package supports Python 3.7 (#1448)
+TEST_F(TensorflowTests, DISABLED_BasicTFTest) {
   // Check that the tensorflow library imports and prints version info correctly
   EXPECT_TRUE(brain::TFUtil::GetTFVersion());
 }
@@ -40,7 +41,8 @@ TEST_F(TensorflowTests, BasicEigenTest) {
   EXPECT_TRUE(m.IsRowMajor);
 }
 
-TEST_F(TensorflowTests, SineWavePredictionTest) {
+// TODO: Enable this test once tensorflow package supports Python 3.7 (#1448)
+TEST_F(TensorflowTests, DISABLED_SineWavePredictionTest) {
   // Sine Wave prediction test works here
   int NUM_SAMPLES = 1000;
   int NUM_WAVES = 3;