Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-cfgdiff for openSUSE:Factory
checked in at 2022-01-22 08:18:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-cfgdiff (Old)
and /work/SRC/openSUSE:Factory/.python-cfgdiff.new.1938 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-cfgdiff"
Sat Jan 22 08:18:22 2022 rev:4 rq:947920 version:0.0.0+git.1641843506.dc1234a
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-cfgdiff/python-cfgdiff.changes
2021-01-20 18:28:01.323550601 +0100
+++ /work/SRC/openSUSE:Factory/.python-cfgdiff.new.1938/python-cfgdiff.changes
2022-01-22 08:19:19.542442205 +0100
@@ -1,0 +2,7 @@
+Thu Jan 20 17:24:30 UTC 2022 - dims...@opensuse.org
+
+- Update to version 0.0.0+git.1641843506.dc1234a:
+ * Bump pypa/gh-action-pypi-publish from 1.4.2 to 1.5.0
+ * make version pep440 compatible
+
+-------------------------------------------------------------------
Old:
----
cfgdiff-0.0.0+git.1487961889.dc4e96e.tar.xz
New:
----
cfgdiff-0.0.0+git.1641843506.dc1234a.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-cfgdiff.spec ++++++
--- /var/tmp/diff_new_pack.SPIivZ/_old 2022-01-22 08:19:19.954439428 +0100
+++ /var/tmp/diff_new_pack.SPIivZ/_new 2022-01-22 08:19:19.958439401 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-cfgdiff
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-cfgdiff
-Version: 0.0.0+git.1487961889.dc4e96e
+Version: 0.0.0+git.1641843506.dc1234a
Release: 0
Summary: Cfgdiff -- diff(1) all your configuration files
License: MIT
@@ -66,21 +66,19 @@
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%python_clone -a %{buildroot}%{_bindir}/cfgdiff
-%python_clone -a %{buildroot}%{_mandir}/man1/cfgdiff.1
%post
-%python_install_alternative cfgdiff cfgdiff.1
+%python_install_alternative cfgdiff
%postun
-%python_uninstall_alternative cfgdiff cfgdiff.1
+%python_uninstall_alternative cfgdiff
%check
-%python_exec -m unittest discover test/ -v
+%python_exec -m unittest discover tests/ -v
%files %{python_files}
%license LICENSE README.md
%{python_sitelib}/*
%python_alternative %{_bindir}/cfgdiff
-%python_alternative %{_mandir}/man1/cfgdiff.1%{?ext_man}
%changelog
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.SPIivZ/_old 2022-01-22 08:19:19.998439132 +0100
+++ /var/tmp/diff_new_pack.SPIivZ/_new 2022-01-22 08:19:20.002439105 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/evgeni/cfgdiff.git</param>
- <param
name="changesrevision">dc4e96eee5783a06a44cad2eda3187dbee16d0d1</param></service></servicedata>
+ <param
name="changesrevision">dc1234a9d8f9238509c863801bb7bf3b75083f60</param></service></servicedata>
(No newline at EOF)
++++++ cfgdiff-0.0.0+git.1487961889.dc4e96e.tar.xz ->
cfgdiff-0.0.0+git.1641843506.dc1234a.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.github/dependabot.yml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/.github/dependabot.yml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.github/dependabot.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/.github/dependabot.yml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,8 @@
+version: 2
+updates:
+
+ # Maintain dependencies for GitHub Actions
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "daily"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.github/workflows/main.yml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/.github/workflows/main.yml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.github/workflows/main.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/.github/workflows/main.yml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,33 @@
+name: CI
+
+on: [push, pull_request]
+
+env:
+ COLORTERM: 'yes'
+ TERM: 'xterm-256color'
+ PYTEST_ADDOPTS: '--color=yes'
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ python:
+ - "3.6"
+ - "3.7"
+ - "3.8"
+ - "3.9"
+ - "3.10"
+ env:
+ PYTHON: ${{ matrix.python }}
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.python }}
+ - name: Install dependencies
+ run: pip install tox tox-gh-actions
+ - name: Run tests
+ run: tox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.github/workflows/release.yml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/.github/workflows/release.yml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.github/workflows/release.yml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/.github/workflows/release.yml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,27 @@
+name: release
+
+on:
+ push:
+ tags:
+ - v[0-9]+.[0-9]+.[0-9]+
+
+jobs:
+ release:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up Python
+ uses: actions/setup-python@v2
+ with:
+ python-version: "3.7"
+ - name: Install wheel
+ run: pip install wheel
+ - name: Build sdist and wheel
+ run: python setup.py sdist bdist_wheel
+ - name: Publish to PyPI
+ uses: pypa/gh-action-pypi-publish@v1.5.0
+ with:
+ user: __token__
+ password: ${{ secrets.pypi_password }}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.gitignore
new/cfgdiff-0.0.0+git.1641843506.dc1234a/.gitignore
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.gitignore 1970-01-01
01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/.gitignore 2022-01-10
20:38:26.000000000 +0100
@@ -0,0 +1,5 @@
+__pycache__
+*.pyc
+*.egg-info
+dist
+.tox
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.pylintrc
new/cfgdiff-0.0.0+git.1641843506.dc1234a/.pylintrc
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.pylintrc 1970-01-01
01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/.pylintrc 2022-01-10
20:38:26.000000000 +0100
@@ -0,0 +1,2 @@
+[MASTER]
+ignore=docs,tests
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.travis.yml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/.travis.yml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/.travis.yml 2017-02-24
19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/.travis.yml 1970-01-01
01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-sudo: false
-language: python
-cache: pip
-python:
- - "2.7"
- - "3.2"
- - "3.3"
- - "3.4"
- - "3.5"
- - "3.6"
-install:
- - pip install pep8
- - pip install -r requirements.txt
-script:
- - nosetests -v
- - pep8 --ignore=E501 ./cfgdiff .
- - ./cfgdiff -v
- - ./cfgdiff -h
- - ./cfgdiff -i ini ./test/test_same_1-a.ini ./test/test_same_1-b.ini
- - ./cfgdiff -i json ./test/test_same_1-a.json ./test/test_same_1-b.json
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cfgdiff-0.0.0+git.1487961889.dc4e96e/MANIFEST.in
new/cfgdiff-0.0.0+git.1641843506.dc1234a/MANIFEST.in
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/MANIFEST.in 2017-02-24
19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/MANIFEST.in 2022-01-10
20:38:26.000000000 +0100
@@ -1,4 +1,4 @@
include *.1
include README.md
-include test/*
-exclude test/*.pyc
+include tests/*
+exclude tests/*.pyc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cfgdiff-0.0.0+git.1487961889.dc4e96e/cfgdiff.py
new/cfgdiff-0.0.0+git.1641843506.dc1234a/cfgdiff.py
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/cfgdiff.py 2017-02-24
19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/cfgdiff.py 2022-01-10
20:38:26.000000000 +0100
@@ -1,22 +1,17 @@
+"""
+cfgdiff - diff(1) all your configs
+"""
+
import os
-import sys
-import collections
import json
+from collections import OrderedDict
+from collections.abc import MutableMapping
from io import BytesIO
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
+from io import StringIO
-if PY2:
- from cStringIO import StringIO
-else:
- from io import StringIO
-
-if PY3:
- import configparser
-else:
- import ConfigParser as configparser
+import configparser
supported_formats = ['ini', 'json']
@@ -36,26 +31,30 @@
import configobj
supported_formats.append('conf')
except ImportError:
- configobj = None
+ configobj = None # pylint:disable=invalid-name
try:
+ # pylint:disable = unused-import
import reconfigure
import reconfigure.configs
supported_formats.append('reconf')
except (ImportError, SyntaxError):
- reconfigure = None
+ reconfigure = None # pylint:disable=invalid-name
try:
import dns.zone
supported_formats.append('zone')
except (ImportError, SyntaxError):
- dns = None
+ dns = None # pylint:disable=invalid-name
-version = '0.1-git'
+version = '0.1.0.dev0' # pylint:disable=invalid-name
-class SortedDict(collections.MutableMapping):
- __slots__ = '_data'
+class SortedDict(MutableMapping):
+ """
+ a dictionary that can be iterated in a sorted way
+ """
+ __slots__ = ('_data',)
def __init__(self):
self._data = {}
@@ -78,12 +77,15 @@
if configobj:
class StrippedConfigObj(configobj.ConfigObj):
+ """
+ A ConfigObj without comments
+ """
- def write(self, outfile=None, section=None, ordered=False):
+ def write(self, outfile=None, section=None, ordered=False): #
pylint:disable=arguments-differ
if section is None:
section = self
- self.initial_comment = ''
- self.final_comment = ''
+ self.initial_comment = '' #
pylint:disable=attribute-defined-outside-init
+ self.final_comment = '' #
pylint:disable=attribute-defined-outside-init
if not ordered:
section.scalars.sort()
section.sections.sort()
@@ -92,10 +94,15 @@
section.inline_comments[entry] = ''
if section is self:
section = None
- return super(StrippedConfigObj, self).write(outfile, section)
+ return super().write(outfile, section)
+
+class DiffBase:
+ """
+ Base class for all later diff types
-class DiffBase(object):
+ Provides initialization and stub methods.
+ """
def __init__(self, filename, ordered=False, parser=None):
self.filename = filename
@@ -106,56 +113,70 @@
if filename != '/dev/null' and os.path.getsize(filename) > 0:
try:
self.parse()
- except Exception as e:
- self.error = repr(e)
+ except Exception as exc: # pylint:disable=broad-except
+ self.error = repr(exc)
def parse(self):
- pass
+ """
+ parse a file and store its representation
+ """
+ raise NotImplementedError
def readlines(self):
+ """
+ read all lines of the pretty printed version
+ """
self.pretty.seek(0)
return self.pretty.readlines()
class INIDiff(DiffBase):
+ """
+ compare ini files using a configparser
+ """
def parse(self):
if self.ordered:
- dicttype = collections.OrderedDict
+ dicttype = OrderedDict
else:
dicttype = SortedDict
- if PY3:
self.config = configparser.RawConfigParser(allow_no_value=True,
dict_type=dicttype,
strict=False)
- else:
- self.config = configparser.RawConfigParser(allow_no_value=True,
- dict_type=dicttype)
self.config.read(self.filename)
self.config.write(self.pretty)
class JSONDiff(DiffBase):
+ """
+ compare JSON files
+ """
def parse(self):
sort_keys = self.ordered is False
- with open(self.filename) as f:
- self.config = json.load(f)
+ with open(self.filename, encoding='utf-8') as jsonfile:
+ self.config = json.load(jsonfile)
json.dump(self.config, self.pretty,
sort_keys=sort_keys, indent=4,
separators=(',', ': '))
class YAMLDiff(DiffBase):
+ """
+ compare YAML files using PyYAML
+ """
def parse(self):
- with open(self.filename) as f:
- self.config = yaml.safe_load(f)
+ with open(self.filename, encoding='utf-8') as yamlfile:
+ self.config = yaml.safe_load(yamlfile)
yaml.safe_dump(self.config, self.pretty, default_flow_style=False,
indent=2)
class XMLDiff(DiffBase):
+ """
+ compare XML files using LXML
+ """
def parse(self):
parser = lxml.etree.XMLParser(remove_blank_text=True,
@@ -170,6 +191,9 @@
class ConfigDiff(DiffBase):
+ """
+ compare config files using ConfigObj
+ """
def parse(self):
self.config = StrippedConfigObj(self.filename)
@@ -177,20 +201,24 @@
self.config.write(self.pretty, ordered=self.ordered)
-reconfcls = None
-
class ReconfigureDiff(DiffBase):
+ """
+ compare config files using reconfigure
+ """
def parse(self):
- with open(self.filename) as f:
- self.config = self.parser(content=f.read())
- l = self.config.load()
- s = l.save()
- self.pretty.write(s[None])
+ with open(self.filename, encoding='utf-8') as reconffile:
+ self.config = self.parser(content=reconffile.read())
+ loaded_config = self.config.load()
+ saved_config = loaded_config.save()
+ self.pretty.write(saved_config[None])
class ZoneDiff(DiffBase):
+ """
+ compare DNS zone files using dnspython
+ """
def parse(self):
self.config = dns.zone.from_file(self.filename, 'example.com')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/requirements-test.txt
new/cfgdiff-0.0.0+git.1641843506.dc1234a/requirements-test.txt
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/requirements-test.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/requirements-test.txt
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,3 @@
+pytest
+pytest-flake8
+pytest-pylint
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cfgdiff-0.0.0+git.1487961889.dc4e96e/setup.py
new/cfgdiff-0.0.0+git.1641843506.dc1234a/setup.py
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/setup.py 2017-02-24
19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/setup.py 2022-01-10
20:38:26.000000000 +0100
@@ -1,3 +1,6 @@
+"""
+setup for cfgdiff
+"""
from setuptools import setup
from cfgdiff import version
@@ -17,7 +20,4 @@
'ConfigObj support': ['ConfigObj'],
'reconfigure support': ['reconfigure'],
},
- data_files=[
- ('/usr/share/man/man1', ['cfgdiff.1'])
- ]
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_cfgdiff.py
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_cfgdiff.py
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_cfgdiff.py
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_cfgdiff.py
1970-01-01 01:00:00.000000000 +0100
@@ -1,120 +0,0 @@
-import unittest
-import cfgdiff
-
-
-class CfgDiffTestCase(unittest.TestCase):
-
- def _test_same(self, cls, filea, fileb, parser=None):
- a = cls(filea, ordered=False, parser=parser)
- b = cls(fileb, ordered=False, parser=parser)
-
- self.assertIsNone(a.error)
- self.assertIsNone(b.error)
-
- self.assertEqual(a.readlines(), b.readlines())
-
- def _test_different(self, cls, filea, fileb, parser=None):
- a = cls(filea, ordered=False, parser=parser)
- b = cls(fileb, ordered=False, parser=parser)
-
- self.assertIsNone(a.error)
- self.assertIsNone(b.error)
-
- self.assertNotEqual(a.readlines(), b.readlines())
-
-
-class INIDiffTestCase(CfgDiffTestCase):
-
- def test_ini_same(self):
- self._test_same(cfgdiff.INIDiff, './test/test_same_1-a.ini',
- './test/test_same_1-b.ini')
-
- def test_ini_different(self):
- self._test_different(cfgdiff.INIDiff,
- './test/test_different_1-a.ini',
- './test/test_different_1-b.ini')
-
-
-class JSONDiffTestCase(CfgDiffTestCase):
-
- def test_json_same(self):
- self._test_same(cfgdiff.JSONDiff, './test/test_same_1-a.json',
- './test/test_same_1-b.json')
-
- def test_json_different(self):
- self._test_different(cfgdiff.JSONDiff,
- './test/test_different_1-a.json',
- './test/test_different_1-b.json')
-
-
-@unittest.skipUnless('yaml' in cfgdiff.supported_formats, 'requires PyYAML')
-class YAMLDiffTestcase(CfgDiffTestCase):
-
- def test_yaml_same(self):
- self._test_same(cfgdiff.YAMLDiff, './test/test_same_1-a.yaml',
- './test/test_same_1-b.yaml')
-
- def test_yaml_different(self):
- self._test_different(cfgdiff.YAMLDiff,
- './test/test_different_1-a.yaml',
- './test/test_different_1-b.yaml')
-
-
-@unittest.skipUnless('xml' in cfgdiff.supported_formats, 'requires LXML')
-class XMLDiffTestCase(CfgDiffTestCase):
-
- def test_xml_same(self):
- self._test_same(cfgdiff.XMLDiff, './test/test_same_1-a.xml',
- './test/test_same_1-b.xml')
-
- def test_xml_different(self):
- self._test_different(cfgdiff.XMLDiff,
- './test/test_different_1-a.xml',
- './test/test_different_1-b.xml')
-
-
-@unittest.skipUnless('conf' in cfgdiff.supported_formats, 'requires ConfigObj')
-class ConfigDiffTestCase(CfgDiffTestCase):
-
- def test_conf_same(self):
- self._test_same(cfgdiff.ConfigDiff, './test/test_same_1-a.ini',
- './test/test_same_1-b.ini')
-
- def test_conf_different(self):
- self._test_different(cfgdiff.ConfigDiff,
- './test/test_different_1-a.ini',
- './test/test_different_1-b.ini')
-
-
-@unittest.skipUnless('reconf' in cfgdiff.supported_formats,
- 'requires reconfigure')
-class ReconfigureDiffTestCase(CfgDiffTestCase):
-
- def setUp(self):
- configs = __import__('reconfigure.configs', fromlist=['reconfigure'])
- self.parser = configs.SambaConfig
-
- @unittest.expectedFailure
- def test_reconf_same(self):
- self._test_same(cfgdiff.ReconfigureDiff,
- './test/test_same_1-a.ini',
- './test/test_same_1-b.ini', self.parser)
-
- def test_reconf_different(self):
- self._test_different(cfgdiff.ReconfigureDiff,
- './test/test_different_1-a.ini',
- './test/test_different_1-b.ini', self.parser)
-
-
-@unittest.skipUnless('zone' in cfgdiff.supported_formats, 'requires dnspython')
-class ZoneDiffTestCase(CfgDiffTestCase):
-
- def test_zone_same(self):
- self._test_same(cfgdiff.ZoneDiff,
- './test/test_same_1-a.zone',
- './test/test_same_1-b.zone')
-
- def test_zone_different(self):
- self._test_different(cfgdiff.ZoneDiff,
- './test/test_different_1-a.zone',
- './test/test_different_1-b.zone')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-a.ini
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-a.ini
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-a.ini
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-a.ini
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-[bar]
-buxte = hude
-[foo]
-bix = bux
-bar = bax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-a.json
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-a.json
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-a.json
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-a.json
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-{"foo": "bar",
- "bax": "fix"
-
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-a.xml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-a.xml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-a.xml
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-a.xml
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-<foo>
- <bar>baz</bar>
- <fux>fiz</fux>
-</foo>
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-a.yaml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-a.yaml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-a.yaml
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-a.yaml
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
----
-foo: bar
-bax: fix
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-a.zone
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-a.zone
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-a.zone
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-a.zone
1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-$TTL 5m
-@ IN SOA ns.example.com. hostnamster.example.com. (
- 2013063002 ; serial
- 5m ; refresh
- 5m ; retry
- 5m ; expiry
- 5m) ; minimum
-
- IN NS ns.example.com.
- IN NS ns2.example.com.
-
- IN MX 10 mail
-
- IN A 192.0.2.1
-
-mail IN A 192.0.2.2
-imap IN A 192.0.2.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-b.ini
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-b.ini
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-b.ini
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-b.ini
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-[bar]
-buxte = hoode
-[foo]
-bix = bux
-bar = bax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-b.json
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-b.json
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-b.json
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-b.json
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-{"foo": "bar2",
- "bax": "fix"
-
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-b.xml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-b.xml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-b.xml
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-b.xml
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-<foo>
- <bar>baz2</bar>
- <fux>fiz</fux>
-</foo>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-b.yaml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-b.yaml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-b.yaml
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-b.yaml
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
----
-foo: bar2
-bax: fix
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-b.zone
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-b.zone
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_different_1-b.zone
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_different_1-b.zone
1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-$TTL 5m
-@ IN SOA ns.example.com. hostnamster.example.com. (
- 2013063002 ; serial
- 5m ; refresh
- 5m ; retry
- 5m ; expiry
- 5m) ; minimum
-
- IN NS ns.example.com.
- IN NS ns2.example.com.
-
- IN MX 10 mail
-
- IN A 192.0.2.1
-
-mail IN A 192.0.2.1
-imap IN A 192.0.2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-a.ini
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-a.ini
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-a.ini
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-a.ini
1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-# foo is bar
-[foo]
-# bar bar bar
-bar = bax
-bix = bux
-
-[bar]
-buxte = hude
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-a.json
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-a.json
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-a.json
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-a.json
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-{"foo": "bar",
- "bax": "fix"
-
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-a.xml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-a.xml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-a.xml
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-a.xml
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-<foo>
- <bar>baz</bar>
-<fux>fiz</fux>
-</foo>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-a.yaml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-a.yaml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-a.yaml
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-a.yaml
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
----
-foo: bar
-bax: fix
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-a.zone
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-a.zone
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-a.zone
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-a.zone
1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-$TTL 5m
-@ IN SOA ns.example.com. hostnamster.example.com. (
- 2013063002 ; serial
- 5m ; refresh
- 5m ; retry
- 5m ; expiry
- 5m) ; minimum
-
- IN NS ns.example.com.
- IN NS ns2.example.com.
-
- IN MX 10 mail
-
- IN A 192.0.2.1
-
-mail IN A 192.0.2.2
-imap IN A 192.0.2.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-b.ini
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-b.ini
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-b.ini
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-b.ini
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-[bar]
-buxte = hude
-[foo]
-bix = bux
-bar = bax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-b.json
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-b.json
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-b.json
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-b.json
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-{
- "bax": "fix",
- "foo": "bar"
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-b.xml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-b.xml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-b.xml
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-b.xml
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-<foo><fux>fiz</fux><bar>baz</bar></foo>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-b.yaml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-b.yaml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-b.yaml
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-b.yaml
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
----
-bax: fix
-foo: "bar"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-b.zone
new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-b.zone
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/test/test_same_1-b.zone
2017-02-24 19:44:49.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/test/test_same_1-b.zone
1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-$TTL 5m
-@ IN SOA ns.example.com. hostnamster.example.com. (
- 2013063002 ; serial
- 5m ; refresh
- 5m ; retry
- 5m ; expiry
- 5m) ; minimum
-
- IN NS ns.example.com.
- IN NS ns2.example.com.
-
- IN MX 10 mail
- IN A 192.0.2.1
-imap IN A 192.0.2.2
-mail IN A 192.0.2.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_cfgdiff.py
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_cfgdiff.py
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_cfgdiff.py
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_cfgdiff.py
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,129 @@
+import unittest
+import cfgdiff
+
+
+class CfgDiffTestCase(unittest.TestCase):
+
+ def _test_same(self, cls, filea, fileb, parser=None):
+ a = cls(filea, ordered=False, parser=parser)
+ b = cls(fileb, ordered=False, parser=parser)
+
+ self.assertIsNone(a.error)
+ self.assertIsNone(b.error)
+
+ self.assertEqual(a.readlines(), b.readlines())
+
+ def _test_different(self, cls, filea, fileb, parser=None):
+ a = cls(filea, ordered=False, parser=parser)
+ b = cls(fileb, ordered=False, parser=parser)
+
+ self.assertIsNone(a.error)
+ self.assertIsNone(b.error)
+
+ self.assertNotEqual(a.readlines(), b.readlines())
+
+
+class INIDiffTestCase(CfgDiffTestCase):
+
+ def test_ini_same(self):
+ self._test_same(cfgdiff.INIDiff, './tests/test_same_1-a.ini',
+ './tests/test_same_1-b.ini')
+
+ def test_ini_different(self):
+ self._test_different(cfgdiff.INIDiff,
+ './tests/test_different_1-a.ini',
+ './tests/test_different_1-b.ini')
+
+
+class JSONDiffTestCase(CfgDiffTestCase):
+
+ def test_json_same(self):
+ self._test_same(cfgdiff.JSONDiff, './tests/test_same_1-a.json',
+ './tests/test_same_1-b.json')
+
+ def test_json_different(self):
+ self._test_different(cfgdiff.JSONDiff,
+ './tests/test_different_1-a.json',
+ './tests/test_different_1-b.json')
+
+
+@unittest.skipUnless('yaml' in cfgdiff.supported_formats, 'requires PyYAML')
+class YAMLDiffTestcase(CfgDiffTestCase):
+
+ def test_yaml_same(self):
+ self._test_same(cfgdiff.YAMLDiff, './tests/test_same_1-a.yaml',
+ './tests/test_same_1-b.yaml')
+
+ def test_yaml_different(self):
+ self._test_different(cfgdiff.YAMLDiff,
+ './tests/test_different_1-a.yaml',
+ './tests/test_different_1-b.yaml')
+
+
+@unittest.skipUnless('xml' in cfgdiff.supported_formats, 'requires LXML')
+class XMLDiffTestCase(CfgDiffTestCase):
+
+ def test_xml_same(self):
+ self._test_same(cfgdiff.XMLDiff, './tests/test_same_1-a.xml',
+ './tests/test_same_1-b.xml')
+
+ def test_xml_different(self):
+ self._test_different(cfgdiff.XMLDiff,
+ './tests/test_different_1-a.xml',
+ './tests/test_different_1-b.xml')
+
+
+@unittest.skipUnless('conf' in cfgdiff.supported_formats, 'requires ConfigObj')
+class ConfigDiffTestCase(CfgDiffTestCase):
+
+ def test_conf_same(self):
+ self._test_same(cfgdiff.ConfigDiff, './tests/test_same_1-a.ini',
+ './tests/test_same_1-b.ini')
+
+ def test_conf_different(self):
+ self._test_different(cfgdiff.ConfigDiff,
+ './tests/test_different_1-a.ini',
+ './tests/test_different_1-b.ini')
+
+
+@unittest.skipUnless('reconf' in cfgdiff.supported_formats,
+ 'requires reconfigure')
+class ReconfigureDiffTestCase(CfgDiffTestCase):
+
+ def setUp(self):
+ self.configs = __import__('reconfigure.configs',
fromlist=['reconfigure'])
+
+ @unittest.expectedFailure
+ def test_reconf_same(self):
+ self._test_same(cfgdiff.ReconfigureDiff,
+ './tests/test_same_1-a.ini',
+ './tests/test_same_1-b.ini', self.configs.SambaConfig)
+
+ def test_reconf_different(self):
+ self._test_different(cfgdiff.ReconfigureDiff,
+ './tests/test_different_1-a.ini',
+ './tests/test_different_1-b.ini',
self.configs.SambaConfig)
+
+ @unittest.expectedFailure
+ def test_reconf_same_bind(self):
+ self._test_same(cfgdiff.ReconfigureDiff,
+ './tests/test_same_1-a.isc',
+ './tests/test_same_1-b.isc', self.configs.BIND9Config)
+
+ def test_reconf_different_bind(self):
+ self._test_different(cfgdiff.ReconfigureDiff,
+ './tests/test_different_1-a.isc',
+ './tests/test_different_1-b.isc',
self.configs.BIND9Config)
+
+@unittest.skipUnless('zone' in cfgdiff.supported_formats, 'requires dnspython')
+class ZoneDiffTestCase(CfgDiffTestCase):
+
+ def test_zone_same(self):
+ self._test_same(cfgdiff.ZoneDiff,
+ './tests/test_same_1-a.zone',
+ './tests/test_same_1-b.zone')
+
+ def test_zone_different(self):
+ self._test_different(cfgdiff.ZoneDiff,
+ './tests/test_different_1-a.zone',
+ './tests/test_different_1-b.zone')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.ini
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.ini
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.ini
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.ini
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,5 @@
+[bar]
+buxte = hude
+[foo]
+bix = bux
+bar = bax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.isc
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.isc
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.isc
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.isc
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,6 @@
+zone "example.org" in {
+ type master;
+ file "/etc/bind/example.zone";
+ allow-query { any; };
+};
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.json
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.json
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.json
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.json
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,4 @@
+{"foo": "bar",
+ "bax": "fix"
+
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.xml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.xml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.xml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,5 @@
+<foo>
+ <bar>baz</bar>
+ <fux>fiz</fux>
+</foo>
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.yaml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.yaml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.yaml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,4 @@
+---
+foo: bar
+bax: fix
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.zone
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.zone
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-a.zone
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-a.zone
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,17 @@
+$TTL 5m
+@ IN SOA ns.example.com. hostnamster.example.com. (
+ 2013063002 ; serial
+ 5m ; refresh
+ 5m ; retry
+ 5m ; expiry
+ 5m) ; minimum
+
+ IN NS ns.example.com.
+ IN NS ns2.example.com.
+
+ IN MX 10 mail
+
+ IN A 192.0.2.1
+
+mail IN A 192.0.2.2
+imap IN A 192.0.2.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.ini
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.ini
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.ini
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.ini
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,5 @@
+[bar]
+buxte = hoode
+[foo]
+bix = bux
+bar = bax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.isc
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.isc
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.isc
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.isc
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,6 @@
+zone "example.net" in {
+ type master;
+ file "/etc/bind/example.zone";
+ allow-query { any; };
+};
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.json
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.json
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.json
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.json
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,4 @@
+{"foo": "bar2",
+ "bax": "fix"
+
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.xml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.xml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.xml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,4 @@
+<foo>
+ <bar>baz2</bar>
+ <fux>fiz</fux>
+</foo>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.yaml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.yaml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.yaml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,4 @@
+---
+foo: bar2
+bax: fix
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.zone
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.zone
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_different_1-b.zone
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_different_1-b.zone
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,17 @@
+$TTL 5m
+@ IN SOA ns.example.com. hostnamster.example.com. (
+ 2013063002 ; serial
+ 5m ; refresh
+ 5m ; retry
+ 5m ; expiry
+ 5m) ; minimum
+
+ IN NS ns.example.com.
+ IN NS ns2.example.com.
+
+ IN MX 10 mail
+
+ IN A 192.0.2.1
+
+mail IN A 192.0.2.1
+imap IN A 192.0.2.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.ini
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.ini
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.ini
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.ini
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,8 @@
+# foo is bar
+[foo]
+# bar bar bar
+bar = bax
+bix = bux
+
+[bar]
+buxte = hude
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.isc
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.isc
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.isc
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.isc
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,6 @@
+zone "example.org" in {
+ type master;
+ file "/etc/bind/example.zone";
+ allow-query { any; };
+};
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.json
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.json
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.json
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.json
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,4 @@
+{"foo": "bar",
+ "bax": "fix"
+
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.xml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.xml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.xml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,4 @@
+<foo>
+ <bar>baz</bar>
+<fux>fiz</fux>
+</foo>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.yaml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.yaml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.yaml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,4 @@
+---
+foo: bar
+bax: fix
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.zone
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.zone
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-a.zone
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-a.zone
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,17 @@
+$TTL 5m
+@ IN SOA ns.example.com. hostnamster.example.com. (
+ 2013063002 ; serial
+ 5m ; refresh
+ 5m ; retry
+ 5m ; expiry
+ 5m) ; minimum
+
+ IN NS ns.example.com.
+ IN NS ns2.example.com.
+
+ IN MX 10 mail
+
+ IN A 192.0.2.1
+
+mail IN A 192.0.2.2
+imap IN A 192.0.2.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.ini
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.ini
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.ini
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.ini
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,5 @@
+[bar]
+buxte = hude
+[foo]
+bix = bux
+bar = bax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.isc
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.isc
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.isc
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.isc
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,7 @@
+# example comment
+zone "example.org" in {
+ type master;
+ file "/etc/bind/example.zone";
+ allow-query { any; };
+};
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.json
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.json
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.json
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.json
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,5 @@
+{
+ "bax": "fix",
+ "foo": "bar"
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.xml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.xml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.xml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1 @@
+<foo><fux>fiz</fux><bar>baz</bar></foo>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.yaml
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.yaml
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.yaml
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,3 @@
+---
+bax: fix
+foo: "bar"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.zone
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.zone
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tests/test_same_1-b.zone
1970-01-01 01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tests/test_same_1-b.zone
2022-01-10 20:38:26.000000000 +0100
@@ -0,0 +1,15 @@
+$TTL 5m
+@ IN SOA ns.example.com. hostnamster.example.com. (
+ 2013063002 ; serial
+ 5m ; refresh
+ 5m ; retry
+ 5m ; expiry
+ 5m) ; minimum
+
+ IN NS ns.example.com.
+ IN NS ns2.example.com.
+
+ IN MX 10 mail
+ IN A 192.0.2.1
+imap IN A 192.0.2.2
+mail IN A 192.0.2.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tox.ini
new/cfgdiff-0.0.0+git.1641843506.dc1234a/tox.ini
--- old/cfgdiff-0.0.0+git.1487961889.dc4e96e/tox.ini 1970-01-01
01:00:00.000000000 +0100
+++ new/cfgdiff-0.0.0+git.1641843506.dc1234a/tox.ini 2022-01-10
20:38:26.000000000 +0100
@@ -0,0 +1,23 @@
+# For more information about tox, see https://tox.readthedocs.io/en/latest/
+[tox]
+envlist = py36,py37,py38,py39,py310
+
+[testenv]
+deps =
+ -rrequirements.txt
+ -rrequirements-test.txt
+commands =
+ py.test --pylint -v {posargs}
+
+[pytest]
+flake8-ignore =
+ .tox/* ALL
+ tests/* ALL
+
+[gh-actions]
+python =
+ 3.6: py36
+ 3.7: py37
+ 3.8: py38
+ 3.9: py39
+ 3.10: py310
