ioggstream
diff --git a/‎python-for-sysadmin/notebooks/02_nosetests_simple.ipynb‎
Lines changed: 46 additions & 17 deletions b/‎python-for-sysadmin/notebooks/02_nosetests_simple.ipynb‎
Lines changed: 46 additions & 17 deletions
@@ -179,54 +179,83 @@
    },
    "outputs": [],
    "source": [
-    "%load 02_nosetests_full.py"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 4,
-   "metadata": {
-    "collapsed": true
-   },
-   "outputs": [],
-   "source": [
+    "# %load 02_nosetests_full.py\n",
     "\"\"\"An articulated nosetest script using classes\n",
     "\n",
     "   - setup_class() and setup() increase flexibility\n",
     "\"\"\"\n",
     "\n",
     "import os\n",
+    "import errno\n",
     "\n",
+    "# Import assert_* tools\n",
+    "from nose.tools import *\n",
     "\n",
-    "class TestB:\n",
+    "class TestB(object):\n",
     "\n",
     "    @classmethod\n",
     "    def setup_class(self):\n",
     "        # Run once at startup, eg. create database structure\n",
-    "        print(\"setup testsuite environment\")\n",
+    "        print(\"\\nsetup testsuite environment\")\n",
     "        open(\"/tmp/test2.out\", \"w\").write(\"0\")\n",
     "\n",
     "    @classmethod\n",
     "    def teardown_class(self):\n",
     "        # Run once at teardown, eg. drop database\n",
-    "        print(\"cleanup testsuite environment\")\n",
+    "        print(\"\\ncleanup testsuite environment\")\n",
     "        os.unlink(\"/tmp/test2.out\")\n",
     "\n",
     "    def setup(self):\n",
     "        # Before every test, like populate a table\n",
-    "        print(\"before_every_test\")\n",
+    "        print(\"\\nbefore_every_test\")\n",
     "\n",
     "    def teardown(self):\n",
     "        # After every test, eg truncate a table\n",
-    "        print(\"after_every_test\")\n",
+    "        print(\"\\nafter_every_test\")\n",
     "\n",
     "    def test_a(self):\n",
     "        assert os.path.isfile(\"/tmp/test2.out\")\n",
     "\n",
     "    def test_b(self):\n",
-    "        assert False"
+    "        assert False\n",
+    "\n",
+    "    #\n",
+    "    # Bonus examples:\n",
+    "    #\n",
+    "    #   - testing exceptions\n",
+    "    #   - parametrized tests \n",
+    "    #\n",
+    "    @raises(IOError)\n",
+    "    def test_except(self):\n",
+    "        assert open('/tmp/MISSING')\n",
+    "\n",
+    "    def test_except_complex(self):\n",
+    "        with assert_raises(IOError) as ex:\n",
+    "            fh = open('/tmp/MISSING')\n",
+    "        # Verify exception *and* errno!\n",
+    "        assert_equals(ex.exception.errno, errno.ENOENT)\n",
+    "\n",
+    "    def test_parametrized(self):\n",
+    "        # Runs 3 tests using the nosetest generator syntax.\n",
+    "        for i in range(3):\n",
+    "            # You have to yield a method to make it work into \n",
+    "            #  a class\n",
+    "            yield self.harn_greater, i, 0 \n",
+    "\n",
+    "    def harn_greater(self, a, b):\n",
+    "        assert_greater(a, b)\n",
+    "\n"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": 9,