Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Adam Osuchowski
Kea
Commits
619c53ae
Commit
619c53ae
authored
Dec 18, 2012
by
JINMEI Tatuya
Committed by
Jelte Jansen
Dec 19, 2012
Browse files
[2380] removed isc.datasrc.master.py and its tests. now no need for them.
parent
f91f820e
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
src/lib/python/isc/datasrc/Makefile.am
View file @
619c53ae
...
...
@@ -2,7 +2,7 @@ SUBDIRS = . tests
# old data, should be removed in the near future once conversion is done
pythondir
=
$(pyexecdir)
/isc/datasrc
python_PYTHON
=
__init__.py
master.py
sqlite3_ds.py
python_PYTHON
=
__init__.py sqlite3_ds.py
# new data
...
...
src/lib/python/isc/datasrc/master.py
deleted
100644 → 0
View file @
f91f820e
This diff is collapsed.
Click to expand it.
src/lib/python/isc/datasrc/tests/Makefile.am
View file @
619c53ae
PYCOVERAGE_RUN
=
@PYCOVERAGE_RUN@
# old tests, TODO remove or change to use new API?
#PYTESTS = master_test.py
PYTESTS
=
datasrc_test.py sqlite3_ds_test.py
PYTESTS
+=
clientlist_test.py zone_loader_test.py
EXTRA_DIST
=
$(PYTESTS)
...
...
src/lib/python/isc/datasrc/tests/master_test.py
deleted
100644 → 0
View file @
f91f820e
# Copyright (C) 2010 Internet Systems Consortium.
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SYSTEMS CONSORTIUM
# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
# INTERNET SYSTEMS CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
from
isc.datasrc.master
import
*
import
unittest
class
TestTTL
(
unittest
.
TestCase
):
def
test_ttl
(
self
):
self
.
assertTrue
(
isttl
(
'3600'
))
self
.
assertTrue
(
isttl
(
'1W'
))
self
.
assertTrue
(
isttl
(
'1w'
))
self
.
assertTrue
(
isttl
(
'2D'
))
self
.
assertTrue
(
isttl
(
'2d'
))
self
.
assertTrue
(
isttl
(
'30M'
))
self
.
assertTrue
(
isttl
(
'30m'
))
self
.
assertTrue
(
isttl
(
'10S'
))
self
.
assertTrue
(
isttl
(
'10s'
))
self
.
assertTrue
(
isttl
(
'2W1D'
))
self
.
assertFalse
(
isttl
(
'not a ttl'
))
self
.
assertFalse
(
isttl
(
'1X'
))
if
__name__
==
'__main__'
:
unittest
.
main
()
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment