Merge pull request #1015 from MSeal/fix_random_notebook_test_failure

Removed newlines from clear notebook test. Refactored test_run_notebooks
jupyter · May 6, 2019 · b625b10 · b625b10
2 parents 6372b7f + 1db7f23
commit b625b10
Show file tree

Hide file tree

Showing 2 changed files with 266 additions and 248 deletions.
diff --git a/nbconvert/preprocessors/tests/files/Clear Output.ipynb b/nbconvert/preprocessors/tests/files/Clear Output.ipynb
@@ -3,20 +3,17 @@
   {
    "cell_type": "code",
    "execution_count": 1,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [],
    "source": [
+    "from __future__ import print_function\n",
     "from IPython.display import clear_output"
    ]
   },
   {
    "cell_type": "code",
    "execution_count": 2,
-   "metadata": {
-    "collapsed": false
-   },
+   "metadata": {},
    "outputs": [
     {
      "name": "stdout",
@@ -51,12 +48,12 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Hello world\n"
+      "Hello world"
      ]
     }
    ],
    "source": [
-    "print(\"Hello world\")\n",
+    "print(\"Hello world\", end='')\n",
     "clear_output(wait=True)  # no output after this"
    ]
   },
@@ -69,14 +66,14 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "world\n"
+      "world"
      ]
     }
    ],
    "source": [
-    "print(\"Hello\")\n",
+    "print(\"Hello\", end='')\n",
     "clear_output(wait=True)  # here we have new output after wait=True\n",
-    "print(\"world\")"
+    "print(\"world\", end='')"
    ]
   },
   {
@@ -165,14 +162,14 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "world\n"
+      "world"
      ]
     }
    ],
    "source": [
     "handle4 = display(\"Hello\", display_id=\"id4\")\n",
     "clear_output(wait=True)\n",
-    "print('world')"
+    "print('world', end='')"
    ]
   },
   {
@@ -185,7 +182,25 @@
    ]
   }
  ],
- "metadata": {},
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.6.7"
+  }
+ },
  "nbformat": 4,
- "nbformat_minor": 0
-}
+ "nbformat_minor": 1
+}