Merge pull request #11 from wangxinhe2006/dev

Bump version number to v0.6.1

README.md

@@ -1,3 +1,7 @@
+<p align="center">
+  <a href="https://github.com/piterator-org"><img src="https://static.piterator.com/logo.png" alt="Piterator" width="20%"></a>
+</p>
+
 # dockerjudge
 [![Build Status](https://www.travis-ci.org/wangxinhe2006/dockerjudge.svg)](https://www.travis-ci.org/wangxinhe2006/dockerjudge)
 [![CodeCov](https://codecov.io/gh/wangxinhe2006/dockerjudge/graph/badge.svg)](https://codecov.io/gh/wangxinhe2006/dockerjudge)
@@ -10,6 +14,5 @@
 A Docker Based Online Judge Engine
 
 # [License](LICENSE)
-Licensed under [the GNU Affero General Public License v3.0](https://www.gnu.org/licenses/agpl-3.0.html)
-
-[![agplv3-155x51.png](https://www.gnu.org/graphics/agplv3-155x51.png)](https://www.gnu.org/graphics/agplv3-155x51.png)
+Licensed under [the Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0)
+<a href="https://commons.wikimedia.org/wiki/File:Apache_Software_Foundation_Logo_(2016).svg"><img src="https://upload.wikimedia.org/wikipedia/commons/d/db/Apache_Software_Foundation_Logo_(2016).svg" alt="Apache Software Foundation Logo (2016).svg" width="10%" align="right"></a>

dockerjudge/__init__.py

@@ -9,7 +9,7 @@
 import docker
 import ruamel.yaml
 
-__version__ = '0.6'
+__version__ = '0.6.1'
 
 
 class Thread(threading.Thread):
@@ -62,7 +62,7 @@ def _judge(dir, container, commands, stdio, timeout, iofn):
                                   'cat {}/{}'.format(dir, iofn[1])],
                                  demux=True)
         if cat.exit_code:
-            return ('OFNF', duration)  # Output File Not Found
+            return ('ONF', duration)  # Output Not Found
         output = cat.output[0]
     else:
         output = result.output[0]

tests.py

@@ -92,7 +92,7 @@ def test_after_judge(self):
                        [('1 1', '1')],
                        1,
                        (None, 'a.out'))
-        self.assertEqual(result[0][0][0], 'OFNF')
+        self.assertEqual(result[0][0][0], 'ONF')
         self.assertFalse(result[1])
 
     def test_io(self):
@@ -119,7 +119,7 @@ def test_io(self):
         self.assertEqual(result[0][2][0], 'RE')
         self.assertFalse(result[1])
 
-    def test_ofnf(self):
+    def test_onf(self):
         result = judge({'image': 'gcc:4.8',
                         'source': 'a.c',
                         'compile': 'gcc a.c',
@@ -136,8 +136,8 @@ def test_ofnf(self):
                         ('1 0', '')],
                        1,
                        (None, 'a.out'))
-        self.assertEqual(result[0][0][0], 'OFNF')
-        self.assertEqual(result[0][1][0], 'OFNF')
+        self.assertEqual(result[0][0][0], 'ONF')
+        self.assertEqual(result[0][1][0], 'ONF')
         self.assertEqual(result[0][2][0], 'RE')
         self.assertFalse(result[1])