Merge pull request sysnux#12 from ceremcem/tests-should-pass

Tests should pass

Author: sysnux

README.md

@@ -3,127 +3,81 @@ btrfs-snapshots-diff
 
 About
 -----
-`btrfs-snapshots-diff.py` is a simple Python2 script that displays the differences 
+`btrfs-snapshots-diff.py` is a simple Python3 script that displays the differences 
 between two Btrfs snapshots (from the same subvolume obviously).
 
-Uses btrfs send to compute the differences, decodes the stream and 
+Uses `btrfs send --no-data` to compute the differences, decodes the stream and 
 displays the differences.
 
-Can read data from parent and current snapshots, or from diff file created with:
-
-`btrfs send -p parent chid --no-data -f /tmp/snaps-diff`
-
 Usage
 -----
-   usage: btrfs-snapshots-diff.py [-h] [-p PARENT] [-c CHILD] [-f FILE] [-t] [-a] [-s] [-j] [-b]
-
-   Display differences between 2 Btrfs snapshots
-
-   optional arguments:
-     -h, --help            show this help message and exit
-     -p PARENT, --parent PARENT
-                        parent snapshot (must exists and be readonly)
-     -c CHILD, --child CHILD
-                        child snapshot (will be created if it does not exist)
-     -f FILE, --file FILE  diff file
-     -t, --filter          does not display temporary files, nor all time modifications
-                        (just latest)
-     -a, --by_path         Group commands by path
-     -s, --csv             CSV output
-     -j, --json            JSON output (commands only)
-     -b, --bogus           Add bogus renamed_from action (used only when grouping by path)
-
-
-Option `--json` (`-j`), available for commands only, will output a list of 
+       usage: btrfs-snapshots-diff.py [options] -p PARENT -c CHILD
+              btrfs-snapshots-diff.py [options] -f FILE
+    
+       Display differences between 2 Btrfs snapshots
+    
+       optional arguments:
+         -h, --help            Show this help message and exit
+         -p, --parent PATH     Path to PARENT (older) snapshot (must be readonly)
+         -c, --child PATH      Path to CHILD (newer) snapshot 
+         -f, --file FILE       Path to diff file generated by 
+                               "btrfs send --no-data -p first second > FILE"
+         -t, --filter          Do not display temporary files or any time modifications (just latest)
+         -a, --by_path         Group commands by path
+         -s, --csv             CSV output
+         -j, --json            JSON output (commands only)
+         -b, --bogus           Add bogus renamed_from action (used only when grouping by path)
+
+
+* `--json` (`-j`), available for commands only, will output a list of 
 commands in JSON format.
 
-Option `--csv` (`-s`) will produce on line for each modification, instead of 
+* `--csv` (`-s`) will produce on line for each modification, instead of 
 formatted output: the first column is the path, then each action taken on the 
 file is in a new column. Separator is ";".
 
-Option `--by_path` (`-a`) groups command by path, giving a better view of what 
+* `--by_path` (`-a`) groups command by path, giving a better view of what 
 happenned on the file system.
 
-`--bogus` (`-b`)  adds a bogus command to the stream, to better track renaming of 
+* `--bogus` (`-b`)  adds a bogus command to the stream, to better track renaming of 
 files / dir (only usefull with `--by_path`).
 
-With option `--filter` (`-t`), the script tries to be a bit smarter (only usefull 
+* With option `--filter` (`-t`), the script tries to be a bit smarter (only usefull 
 with `--by_path`):
- * it does not display temporary files created by send stream,
- * it displays 'created' or 'rewritten' on the files renamed from temporary files,
- * it displays only the latest time modifications, if there are two or more.
+    * it does not display temporary files created by send stream,
+    * it displays 'created' or 'rewritten' on the files renamed from temporary files,
+    * it displays only the latest time modifications, if there are two or more.
 
 Example
 -------
-The example below is the result of creating a new subvolume, taking a 
-snapshot (parent), creating some objects ( a file called "file", a 
-directory called "dir", fifo, link and symlink...), then taking a new snapshot, 
-and last calling btrfs-snapshots-diff to display the differences (see test.sh).
+See [./tests.output](./tests.output) file as an example output. These outputs are created regarding to 
+the changes made by [./tests.sh](./tests.sh): 
+
+```bash
+touch file
+mkdir dir
+mkfifo fifo
+ln file hardlink
+ln -s file symlink
+echo 'Hello Btrfs' > 'xxx;yyy;zzz'
+mv file file2
+```
+
+Tests
+-----
 
-    sudo ./btrfs-snapshots-diff.py -p btrfs-diff-tests.parent -c btrfs-diff-tests.child
-    Found a valid Btrfs stream header, version 1
-    
-    btrfs-diff-tests.child
-    	snapshot: uuid=d6515a0a57d462449bcc9c2533d01277, ctrasid=171948, clone_uuid=b66a4f902e348b46b87d4cb85d967ad9, clone_ctransid=171945
-    
-    __sub_root__
-    	times a=2016/04/03 10:36:13 m=2016/04/03 10:36:15 c=2016/04/03 10:36:15
-    	times a=2016/04/03 10:36:13 m=2016/04/03 10:36:15 c=2016/04/03 10:36:15
-    	times a=2016/04/03 10:36:13 m=2016/04/03 10:36:15 c=2016/04/03 10:36:15
-    	times a=2016/04/03 10:36:13 m=2016/04/03 10:36:15 c=2016/04/03 10:36:15
-    	times a=2016/04/03 10:36:13 m=2016/04/03 10:36:15 c=2016/04/03 10:36:15
-    	times a=2016/04/03 10:36:13 m=2016/04/03 10:36:15 c=2016/04/03 10:36:15
-    
-    o257-171948-0
-    	mkfile
-    	rename to "file"
-    
-    file
-    	renamed from "o257-171948-0"
-    	xattr security.selinux 28277
-    	truncate 0
-    	owner 1000:1000
-    	mode 664
-    	times a=2016/04/03 10:36:15 m=2016/04/03 10:36:15 c=2016/04/03 10:36:15
-    
-    hardlink
-    	link to "file"
-    
-    o258-171948-0
-    	mkdir
-    	rename to "dir"
-    
-    dir
-    	renamed from "o258-171948-0"
-    	xattr security.selinux 28277
-    	owner 1000:1000
-    	mode 775
-    	times a=2016/04/03 10:36:15 m=2016/04/03 10:36:15 c=2016/04/03 10:36:15
-    
-    o259-171948-0
-    	mkfifo
-    	rename to "fifo"
-    
-    fifo
-    	renamed from "o259-171948-0"
-    	xattr security.selinux 28277
-    	owner 1000:1000
-    	mode 664
-    	times a=2016/04/03 10:36:15 m=2016/04/03 10:36:15 c=2016/04/03 10:36:15
-    
-    o260-171948-0
-    	symlink to "file"
-    	rename to "symlink"
-    
-    symlink
-    	renamed from "o260-171948-0"
-    	xattr security.selinux 28277
-    	owner 1000:1000
-    	times a=2016/04/03 10:36:15 m=2016/04/03 10:36:15 c=2016/04/03 10:36:15
+```bash
+./tests.sh > tests.output
+git diff  # inspect visually, there should be no unexpected changes. See issue#13.
+git checkout -- tests.output
+```
 
 Requirements
 ------------
-No requirements besides Python-3!
+
+```
+apt-get install jq
+```
 
 Bugs
 ----

btrfs-snapshots-diff.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # -*- coding: utf-8 -*-
 # vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4
 
@@ -592,6 +592,7 @@ def main():
                 '-f',
                 stream_file,
                 args.child,
+                '-q',
             ]
             try:
                 subprocess.check_call(cmd)