3 new revisions:
Revision: 714aa9d25a42
Author: Pekka Klärck
Date: Wed Jun 15 05:57:44 2011
Log: Removed utils not used anymore...
http://code.google.com/p/robotframework/source/detail?r=714aa9d25a42
Revision: b13674105db1
Author: Pekka Klärck
Date: Wed Jun 15 06:02:47 2011
Log: console logger: a little (very little) cleaner approach for
writing th...
http://code.google.com/p/robotframework/source/detail?r=b13674105db1
Revision: 585fedd61e49
Author: Pekka Klärck
Date: Wed Jun 15 06:48:54 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=585fedd61e49
==============================================================================
Revision: 714aa9d25a42
Author: Pekka Klärck
Date: Wed Jun 15 05:57:44 2011
Log: Removed utils not used anymore
Update issue 869
Removed IdGenerator and FileNameGenerator.
http://code.google.com/p/robotframework/source/detail?r=714aa9d25a42
Deleted:
/src/robot/utils/idgenerator.py
Modified:
/src/robot/utils/__init__.py
=======================================
--- /src/robot/utils/idgenerator.py Sun Feb 6 01:24:10 2011
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2008-2011 Nokia Siemens Networks Oyj
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-import os.path
-
-
-class IdGenerator:
-
- def __init__(self, padding=6):
- self._pattern = '%%s%%0%dd' % padding
- self._ids = {}
-
- def get_id(self, type_=''):
- if not self._ids.has_key(type_):
- self._ids[type_] = 0
- self._ids[type_] += 1
- return self._pattern % (type_, self._ids[type_])
-
- def get_prev(self, type_=''):
- return self._pattern % (type_, self._ids[type_])
-
-
-class FileNameGenerator:
-
- def __init__(self, basename):
- self._name, self._ext = os.path.splitext(basename)
- self._idgen = IdGenerator(padding=3)
-
- def get_name(self):
- return self._get_name(self._idgen.get_id())
-
- def get_prev(self):
- return self._get_name(self._idgen.get_prev())
-
- def get_base(self):
- return self._name + self._ext
-
- def _get_name(self, id_):
- return '%s-%s%s' % (self._name, id_, self._ext)
=======================================
--- /src/robot/utils/__init__.py Sun Jun 12 23:43:41 2011
+++ /src/robot/utils/__init__.py Wed Jun 15 05:57:44 2011
@@ -21,7 +21,6 @@
from escaping import escape, unescape
from htmlutils import html_escape, html_attr_escape
from htmlwriter import HtmlWriter
-from idgenerator import IdGenerator, FileNameGenerator
from importing import simple_import, import_
from match import eq, eq_any, matches, matches_any
from misc import plural_or_not, printable_name, seq2str, seq2str2
==============================================================================
Revision: b13674105db1
Author: Pekka Klärck
Date: Wed Jun 15 06:02:47 2011
Log: console logger: a little (very little) cleaner approach for
writing the first separator line
http://code.google.com/p/robotframework/source/detail?r=b13674105db1
Modified:
/src/robot/output/monitor.py
=======================================
--- /src/robot/output/monitor.py Wed Jun 15 04:01:03 2011
+++ /src/robot/output/monitor.py Wed Jun 15 06:02:47 2011
@@ -25,22 +25,20 @@
self._width = width
self._highlighter = StatusHighlighter(colors)
self._is_logged = IsLogged('WARN')
- # TODO: Could this logic be simplified now that splitting is no
more?
- self._running_suites = 0
+ self._started = False
def start_suite(self, suite):
- if not self._running_suites:
+ if not self._started:
self._write_separator('=')
+ self._started = True
self._write_info(suite.longname, suite.doc, start_suite=True)
self._write_separator('=')
- self._running_suites += 1
def end_suite(self, suite):
self._write_info(suite.longname, suite.doc)
self._write_status(suite.status)
self._write_message(suite.get_full_message())
self._write_separator('=')
- self._running_suites -= 1
def start_test(self, test):
self._write_info(test.name, test.doc)
==============================================================================
Revision: 585fedd61e49
Author: Pekka Klärck
Date: Wed Jun 15 06:48:54 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=585fedd61e49
Deleted:
/src/robot/utils/idgenerator.py
=======================================
--- /src/robot/utils/idgenerator.py Sun Feb 6 01:24:10 2011
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2008-2011 Nokia Siemens Networks Oyj
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-import os.path
-
-
-class IdGenerator:
-
- def __init__(self, padding=6):
- self._pattern = '%%s%%0%dd' % padding
- self._ids = {}
-
- def get_id(self, type_=''):
- if not self._ids.has_key(type_):
- self._ids[type_] = 0
- self._ids[type_] += 1
- return self._pattern % (type_, self._ids[type_])
-
- def get_prev(self, type_=''):
- return self._pattern % (type_, self._ids[type_])
-
-
-class FileNameGenerator:
-
- def __init__(self, basename):
- self._name, self._ext = os.path.splitext(basename)
- self._idgen = IdGenerator(padding=3)
-
- def get_name(self):
- return self._get_name(self._idgen.get_id())
-
- def get_prev(self):
- return self._get_name(self._idgen.get_prev())
-
- def get_base(self):
- return self._name + self._ext
-
- def _get_name(self, id_):
- return '%s-%s%s' % (self._name, id_, self._ext)
