Merge pull request #195 from GoogleCloudPlatform/pytest-blog

Moving blog samples to py.test

Author: Jon Wayne Parrott

blog/introduction_to_data_models_in_cloud_datastore/blog_test.py

@@ -12,13 +12,9 @@
 # limitations under the License.
 
 from blog import main
-import pytest
-from testing import CloudTest
+from testing import mark_flaky
 
 
-@pytest.mark.slow
-class BlogTestCase(CloudTest):
-    """Simple test case that ensures the blog code doesn't throw any errors."""
-
-    def test_main(self):
-        main(self.config.GCLOUD_PROJECT)
+@mark_flaky
+def test_main(cloud_config):
+    main(cloud_config.GCLOUD_PROJECT)

blog/introduction_to_data_models_in_cloud_datastore/wiki_test.py

@@ -11,15 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
-import pytest
-from testing import CloudTest
+from testing import mark_flaky
 from wiki import main
 
 
-@pytest.mark.slow
-class WikiTestCase(CloudTest):
-    """Simple test case that ensures the wiki code doesn't throw any errors."""
-
-    def test_main(self):
-        main(self.config.GCLOUD_PROJECT)
+@mark_flaky
+def test_main(cloud_config):
+    main(cloud_config.GCLOUD_PROJECT)