Remove empty test server file. Spacing clean up

This commit is contained in:
Ross Hendrickson 2013-07-21 18:54:16 -06:00
parent f51f4ad5cd
commit 1e1e72c9c2
6 changed files with 7 additions and 20 deletions

View file

@ -29,7 +29,9 @@ class CuraEngine(object):
logging.info('CuraEngine Created')
def process_file(self, config, gcode, file_path, call_back, call_back_args):
def process_file(
self, config, gcode, file_path, call_back=None,
call_back_args=None):
"""Wraps around the main.cpp processFile method.
:param config: :class: `string` :path to a cura config file:
:param gcode: :class: `string :path to write out the gcode generated:

View file

@ -9,12 +9,12 @@ from octoprint.cura import CuraEngine
class CuraFactoryTestCase(unittest.TestCase):
def test_cura_factory(self):
def test_cura_factory(self):
fake_path = 'my/temp/path'
result = CuraFactory.create_slicer(fake_path)
fake_path = 'my/temp/path'
result = CuraFactory.create_slicer(fake_path)
self.assertEqual(fake_path, result.cura_path)
self.assertEqual(fake_path, result.cura_path)
@patch('threading.Thread')
@ -29,6 +29,5 @@ class CuraFactoryTestCase(unittest.TestCase):
args = [path, '-s', config_path, '-o', file_path]
cura_engine.process_file(config_path, gcode_filename, file_path)
self.assertTrue(thread.called)

View file

@ -128,7 +128,6 @@ class GcodeManager:
file.save(absolutePath)
filename = file.filename
if isGcodeFileName(filename):
return self.processGcode(absolutePath)
@ -143,7 +142,6 @@ class GcodeManager:
filename, absolutePath, callBack, callBackArgs)
def processSTL(self, filename, absolutePath, callBack, callBackArgs):
from octoprint.cura import CuraFactory
curaEngine = CuraFactory.create_slicer()
@ -157,7 +155,6 @@ class GcodeManager:
config, gcodePath, absolutePath, callBack, callBackArgs)
def processGcode(self, absolutePath):
filename = self._getBasicFilename(absolutePath)
if filename in self._metadata.keys():

View file

@ -487,7 +487,6 @@ class Printer():
filename, absolutePath, callBack, callBackArgs)
def streamSdFile(filename, absolutePath):
self._sdStreamer = SdFileStreamer(self._comm, filename, absolutePath, self._onSdFileStreamProgress, self._onSdFileStreamFinish)
self._sdStreamer.start()
logging.info("Stream file to SD started")

View file

@ -509,7 +509,6 @@ def setSettings():
curaEngine = data.get("curaEngine", None)
if curaEngine:
path = curaEngine.get("path")
if path:
s.set(["curaEngine", "path"], path)

View file

@ -1,9 +0,0 @@
import unittest
class FileManipulationTestCase(unittest.TestCase):
def test_simple(self):
self.assertTrue(True)