From 17f20dfaf511940f5533868af27010c761a40a77 Mon Sep 17 00:00:00 2001 From: Donghoon Shin Date: Wed, 28 Sep 2016 09:39:12 +0900 Subject: Rename mock device type to standalone device type Change-Id: I1d310502b249ce68a2c921457fb03aac1c957f63 --- CHANGES.txt | 8 ++++---- README.md | 13 ++++++++----- debian/changelog | 8 ++++---- litmus/__init__.py | 2 +- litmus/core/manager.py | 12 ------------ 5 files changed, 17 insertions(+), 26 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index d5af636..a219c42 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -16,21 +16,21 @@ Version 0.1.1 27 Jun 2016 Version 0.2.0 9 Sep 2016 --------------------------- - Remove acmlock routine to improve test performance -- Support flash function for mock device type +- Support flash function for standalone device type - Update test helper functions Version 0.2.1 9 Sep 2016 --------------------------- - Update import command to use shell-like path expansions -- Update mock device type to avoid sdb error +- Update standalone device type to avoid sdb error - Update default templates for u3 and xu3 Version 0.3.0 21 Sep 2016 --------------------------- - Update projects/topology file location - Add projects/topology param at command prompt -- Support multiple mock devices in topology -- Add global lock for mock device type +- Support multiple standalone devices in topology +- Add global lock for standalone device type Version 0.3.1 22 Sep 2016 --------------------------- diff --git a/README.md b/README.md index 98cb6f7..8bea69b 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,19 @@ Litmus is an automated testing tool for tizen arm devices. + Prerequisite --------------------- Litmus uses sdb to communicate with device. sdb is not released on download.tizen.org/tools but you can find it from sdk. -Installing sdb from tizen sdk or download binary from below url. +Install sdb from tizen sdk or download binary from below url. 32bit: -http://download.tizen.org/sdk/sdk-packages/official/binary/sdb_2.2.83_ubuntu-32.zip +http://download.tizen.org/sdk/tizenstudio/official/binary/sdb_2.2.89_ubuntu-32.zip 64bit: -http://download.tizen.org/sdk/sdk-packages/official/binary/sdb_2.2.83_ubuntu-64.zip +http://download.tizen.org/sdk/tizenstudio/official/binary/sdb_2.2.89_ubuntu-64.zip Unzip this package and copy sdb binary to /usr/bin @@ -42,16 +43,18 @@ Getting started 1. Create a litmus project: - $ litmus mk myproject + $ litmus mk 2. Modify /userscript.py and /conf.yaml 3. Run the litmus project - $ litmus run myproject + $ litmus run Please refer to litmus wiki for more details. + https://github.com/dhs-shine/litmus/wiki + https://wiki.tizen.org/wiki/Litmus diff --git a/debian/changelog b/debian/changelog index 6c83b99..842a097 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,15 +8,15 @@ litmus (0.3.0-1) unstable; urgency=low * Update projects/topology file location * Add projects/topology param at command prompt - * Support multiple mock devices in topology - * Add global lock for mock device type + * Support multiple standalone devices in topology + * Add global lock for standalone device type -- Donghoon Shin Wed, 21 Sep 2016 15:08:00 +0900 litmus (0.2.1-1) unstable; urgency=low * Update import command to use shell-like path expansions - * Update mock device type to avoid sdb error + * Update standalone device type to avoid sdb error * Update default templates for u3 and xu3 -- Donghoon Shin Fri, 9 Sep 2016 15:00:00 +0900 @@ -24,7 +24,7 @@ litmus (0.2.1-1) unstable; urgency=low litmus (0.2.0-1) unstable; urgency=low * Remove acmlock routine to imporve test performance - * Support flash function for mock device type + * Support flash function for standalone device type * Update test helper functions -- Donghoon Shin Fri, 9 Sep 2016 10:03:05 +0900 diff --git a/litmus/__init__.py b/litmus/__init__.py index 3cb3ccd..abbddaf 100644 --- a/litmus/__init__.py +++ b/litmus/__init__.py @@ -21,4 +21,4 @@ _duts_ = os.path.join(_confdir_, 'topology') _projects_ = os.path.join(_confdir_, 'projects') _tmpdir_ = '/tmp' _path_for_locks_ = '/var/lock/litmus/' -_dev_types_ = ('u3', 'xu3', 'mock', 'empty') +_dev_types_ = ('u3', 'xu3', 'standalone', 'empty') diff --git a/litmus/core/manager.py b/litmus/core/manager.py index 183d8c3..b0b27a4 100644 --- a/litmus/core/manager.py +++ b/litmus/core/manager.py @@ -312,15 +312,3 @@ Lightweight test manager for tizen automated testing # Append items self._all_devices.append(items) - - if not next((d for d in self._all_devices if d['dev_type'] == 'mock'), - None): - # Add mock device - mock_devicename = 'MOCK_001' - mock_ilock_filename = os.path.join(self._path_for_locks, - mock_devicename) - mock = {'devicename': mock_devicename, - 'dev_type': 'mock', - 'tlock': Lock(), - 'ilock': fasteners.InterProcessLock(mock_ilock_filename)} - self._all_devices.append(mock) -- cgit v1.2.3