mumuki-python-runner 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20c24cf3d50c5ffd25634e7eca49a1c5bcf91f53ee7b1dbeeec65eb0875f152
-  data.tar.gz: 4289c596dad901e99572419a75609452b6a79ef768dd5426cc4a7c3cff97c829
+  metadata.gz: 7d9650ed6490f860cbc6f99920e4cb0e20d3d021f2d60e691437d60c3d5cecdb
+  data.tar.gz: 681d4896b37179bdec46e097c642a0ab1da1cb5c58e6229c3223edcacd593754
 SHA512:
-  metadata.gz: a84f8de3b8316e96778ffa7048bec1b68a93c917b75da0d9a5e329e508380b4a25db5a2907cf387601ce5913754d6511226bc1cb339eca68cee45a4f8f437720
-  data.tar.gz: 1d18b0fe1be552e8ed7a11cd60263096b03b14b3af772f8c72a3de6baa1c41d480a8b9f30c1c9f1a23b48d6d98d674d4873feefcbfecce4288a9602d0ffb4d33
+  metadata.gz: 549db14da85cef8c7f1485bd55398587bb8cb1988e49964c995d0ec68870e9df63d8d84781c5e230f514c218c2cee12e433799835478b0c664ee744a677f0a4a
+  data.tar.gz: 5a7b67fc170fa4cae85d1e4a3a5c2614fdb14a116a2a6fd729aab4614e90f1e7ae5fd412b56414aefa0eb0da922d04afb1e6a333a3c7bf518891ee6d88f446d9

data/lib/python_runner.rb

@@ -1,15 +1,14 @@
 require 'mumukit'
+require 'nokogiri'
 
 I18n.load_translations_path File.join(__dir__, 'locales', '*.yml')
 
 Mumukit.runner_name = 'python'
 Mumukit.configure do |config|
-  config.docker_image = 'mumuki/mumuki-python-worker'
+  config.docker_image = 'mumuki/mumuki-python-worker:1.1'
 end
 
 require_relative 'version'
 require_relative 'test_hook'
 require_relative 'query_hook'
 require_relative 'metadata_hook'
-
-

data/lib/query_hook.rb

@@ -11,11 +11,17 @@ import string
 
 #{req.extra}
 #{req.content}
-
-print(string.Template("=> $result").substitute(result = #{req.query}))
+#{build_query req.query}
 python
   end
 
+  def build_query(query)
+    if query.match /print *(\(| ).*/
+      query
+    else
+      "print(string.Template(\"=> $result\").substitute(result = #{query}))"
+    end
+  end
 end
 
 

data/lib/test_hook.rb

@@ -12,16 +12,33 @@ class PythonTestHook < Mumukit::Templates::FileHook
   def compile_file_content(request)
     <<python
 import unittest
+import xmlrunner
+import sys
 
 #{request.content}
 #{request.extra}
 #{test_class(request.test)}
 
-
-unittest.main()
+unittest.main(
+  testRunner=xmlrunner.XMLTestRunner(output=sys.__stdout__),
+  failfast=False,
+  buffer=False,
+  catchbreak=False
+)
 python
   end
 
+  def post_process_file(_file, output, status)
+    xml = output.split("Generating XML reports...\n").last
+    raise StandardError, 'No XML found' unless xml.start_with? '<?xml'
+
+    [generate_test_results(Nokogiri::XML(xml))]
+  rescue
+    [output, :errored]
+  end
+
+  private
+
   def test_class(test)
     return test if test =~ /class.*\( *unittest.TestCase *\) *:/
     <<python
@@ -29,5 +46,25 @@ class MumukiTest(unittest.TestCase):
   #{test.gsub(/\n/,"\n\t")}
 python
   end
+
+  def generate_test_results(report)
+    report.xpath('//testcase').map(&method(:test_result))
+  end
+
+  def test_result(test_case)
+    failure = test_case.xpath('failure', 'error')
+    error = failure.attribute('type')
+    message = failure.attribute('message')
+
+    [
+        format_test_name(test_case.attribute('name').to_s),
+        error.nil? ? :passed: :failed,
+        error.nil? ? '' : "#{error}: #{message}"
+    ]
+  end
+
+  def format_test_name(name)
+    name.sub('test_', '').gsub('_', ' ').capitalize
+  end
 end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module PythonVersionHook
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-python-runner
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit