Skip to content

Options for a unix command df #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcin-usielski merged 3 commits into from
Aug 25, 2026
Merged

Options for a unix command df #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
886cbc9
Options for a unix command df
marcin-usielski Aug 21, 2026
dd454ae
style
marcin-usielski Aug 21, 2026
ad08eb1
Moler 4.11.0
marcin-usielski Aug 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![image](https://img.shields.io/badge/pypi-v4.10.1-blue.svg)](https://pypi.org/project/moler/)
[![image](https://img.shields.io/badge/pypi-v4.11.0-blue.svg)](https://pypi.org/project/moler/)
[![image](https://img.shields.io/badge/python-3.8%20%7C%203.9%20%7C%203.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue.svg)](https://pypi.org/project/moler/)
[![Build Status](https://github.com/nokia/moler/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/nokia/moler/actions)
[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](./LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
author = 'Nokia'

# The short X.Y version
version = '4.10.1'
version = '4.11.0'
# The full version, including alpha/beta/rc tags
release = 'stable'

Expand Down
266 changes: 255 additions & 11 deletions moler/cmd/unix/df.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
Df command module.
"""

__author__ = "Yeshu Yang"
__copyright__ = "Copyright (C) 2018, Nokia"
__email__ = "yeshu.yang@nokia.com"
__author__ = "Yeshu Yang, Marcin Usielski"
__copyright__ = "Copyright (C) 2018-2026, Nokia"
__email__ = "yeshu.yang@nokia.com, marcin.usielski@nokia.com"

import re

Expand All @@ -15,17 +15,19 @@


class Df(GenericUnixCommand):
def __init__(self, connection, prompt=None, newline_chars=None, runner=None):
def __init__(self, connection, prompt=None, newline_chars=None, runner=None, options="-BM -T -P"):
super(Df, self).__init__(
connection=connection,
prompt=prompt,
newline_chars=newline_chars,
runner=runner,
)
self._options = options
self._converter_helper = ConverterHelper()

def build_command_string(self):
cmd = "df -BM -T -P"
cmd = f"df {self._options}" if self._options else "df"
print(f"cmd: '{cmd}'")
return cmd

def on_new_line(self, line, is_full_line):
Expand All @@ -37,12 +39,18 @@ def on_new_line(self, line, is_full_line):
return super(Df, self).on_new_line(line, is_full_line)

_re_filesystem_line = re.compile(
r"^(?P<Filesystem>\S+)\s+(?P<Type>\S+)\s+(?P<Size>\S+)M\s+(?P<Used>\S+)M\s+"
r"(?P<Avail>\S+)M\s+(?P<Use_percentage>\d+)%\s+(?P<Mounted_on>\S+)$"
r"^(?P<Filesystem>\S+)\s+(?P<Type>\S+)\s+(?P<Size>[\d\.]+)M?\s+(?P<Used>[\d\.]+)M?\s+"
r"(?P<Avail>[\d\.]+)M?\s+(?P<Use_percentage>\d+)%\s+(?P<Mounted_on>\S+)$"
)

_re_filesystem_line_h = re.compile(
r"^(?P<Filesystem>\S+)\s+(?P<Size>[\d\.]+[TGMK]?)\s+(?P<Used>[\d\.]+[TGMK]?)\s+"
r"(?P<Avail>[\d\.]+[TGMK]?)\s+(?P<Use_percentage>\d+)%\s+(?P<Mounted_on>\S+)$"
)

def _parse_filesystem_line(self, line):
if self._regex_helper.search_compiled(Df._re_filesystem_line, line):
if self._regex_helper.search_compiled(Df._re_filesystem_line, line) or \
self._regex_helper.search_compiled(Df._re_filesystem_line_h, line):
filesystem = self._regex_helper.group("Filesystem")
Mounted_on = self._regex_helper.group("Mounted_on")
if "by_FS" not in self.current_ret:
Expand All @@ -56,8 +64,7 @@ def _parse_filesystem_line(self, line):
raise ParsingDone


COMMAND_OUTPUT = """
[root@Pclinux90: /home/runner]# df -BM -T -P
COMMAND_OUTPUT = """df -BM -T -P
Filesystem Type 1048576-blocks Used Available Capacity Mounted on
/dev/sda2 ext3 4039M 1760M 2073M 46% /
udev tmpfs 999M 1M 999M 1% /dev
Expand All @@ -66,7 +73,7 @@ def _parse_filesystem_line(self, line):
//175.28.247.165/vobs cifs 918588M 1299M 916356M 1% /vobs
//175.28.247.165/vob cifs 918588M 1299M 916356M 1% /vob
//175.28.247.165/cc cifs 918588M 1299M 916356M 1% /cc
[root@Pclinux90: /home/runner]#"""
moler_bash#"""


COMMAND_RESULT = {
Expand Down Expand Up @@ -203,3 +210,240 @@ def _parse_filesystem_line(self, line):
}

COMMAND_KWARGS = {}


COMMAND_KWARGS_TPM = {
"options": "-T -P -m",
}


COMMAND_OUTPUT_TPM = """df -T -P -m
Filesystem Type 1048576-blocks Used Available Capacity Mounted on
none overlay 7856 0 7856 0% /usr/lib/modules/6.6.114.1-microsoft-standard-WSL2
none tmpfs 7856 1 7856 1% /mnt/wsl
drivers 9p 975581 657470 318112 68% /usr/lib/wsl/drivers
/dev/sdd ext4 1031019 84523 894051 9% /
none tmpfs 7856 1 7856 1% /mnt/wslg
none overlay 7856 0 7856 0% /usr/lib/wsl/lib
rootfs rootfs 7851 3 7848 1% /init
moler_bash#"""


COMMAND_RESULT_TPM = {
"by_FS": {
"drivers": {
"Avail": "318112",
"Used": "657470",
"Type": "9p",
"Size": "975581",
"Filesystem": "drivers",
"Mounted_on": "/usr/lib/wsl/drivers",
"Use_percentage": "68",
},
"/dev/sdd": {
"Avail": "894051",
"Used": "84523",
"Type": "ext4",
"Size": "1031019",
"Filesystem": "/dev/sdd",
"Mounted_on": "/",
"Use_percentage": "9",
},
"none": {
"Avail": "7856",
"Used": "0",
"Type": "overlay",
"Size": "7856",
"Filesystem": "none",
"Mounted_on": "/usr/lib/wsl/lib",
"Use_percentage": "0",
},
"rootfs": {
"Avail": "7848",
"Used": "3",
"Type": "rootfs",
"Size": "7851",
"Filesystem": "rootfs",
"Mounted_on": "/init",
"Use_percentage": "1",
},
},
"by_MOUNTPOINT": {
"/usr/lib/modules/6.6.114.1-microsoft-standard-WSL2": {
"Avail": "7856",
"Used": "0",
"Type": "overlay",
"Size": "7856",
"Filesystem": "none",
"Mounted_on": "/usr/lib/modules/6.6.114.1-microsoft-standard-WSL2",
"Use_percentage": "0",
},
"/mnt/wsl": {
"Avail": "7856",
"Used": "1",
"Type": "tmpfs",
"Size": "7856",
"Filesystem": "none",
"Mounted_on": "/mnt/wsl",
"Use_percentage": "1",
},
"/usr/lib/wsl/drivers": {
"Avail": "318112",
"Used": "657470",
"Type": "9p",
"Size": "975581",
"Filesystem": "drivers",
"Mounted_on": "/usr/lib/wsl/drivers",
"Use_percentage": "68",
},
"/": {
"Avail": "894051",
"Used": "84523",
"Type": "ext4",
"Size": "1031019",
"Filesystem": "/dev/sdd",
"Mounted_on": "/",
"Use_percentage": "9",
},
"/mnt/wslg": {
"Avail": "7856",
"Used": "1",
"Type": "tmpfs",
"Size": "7856",
"Filesystem": "none",
"Mounted_on": "/mnt/wslg",
"Use_percentage": "1",
},
"/usr/lib/wsl/lib": {
"Avail": "7856",
"Used": "0",
"Type": "overlay",
"Size": "7856",
"Filesystem": "none",
"Mounted_on": "/usr/lib/wsl/lib",
"Use_percentage": "0",
},
"/init": {
"Avail": "7848",
"Used": "3",
"Type": "rootfs",
"Size": "7851",
"Filesystem": "rootfs",
"Mounted_on": "/init",
"Use_percentage": "1",
},
},
}


COMMAND_KWARGS_H = {
"options": "-h",
}


COMMAND_OUTPUT_H = """df -h
Filesystem Size Used Avail Use% Mounted on
none 7.7G 0 7.7G 0% /usr/lib/modules/6.6.114.1-microsoft-standard-WSL2
none 7.7G 4.0K 7.7G 1% /mnt/wsl
drivers 953G 643G 311G 68% /usr/lib/wsl/drivers
/dev/sdd 1007G 83G 874G 9% /
none 7.7G 48K 7.7G 1% /mnt/wslg
none 7.7G 0 7.7G 0% /usr/lib/wsl/lib
rootfs 7.7G 2.8M 7.7G 1% /init
moler_bash#"""


COMMAND_RESULT_H = {
"by_FS": {
"drivers": {
"Avail": "311G",
"Used": "643G",
"Size": "953G",
"Filesystem": "drivers",
"Mounted_on": "/usr/lib/wsl/drivers",
"Use_percentage": "68",
},
"/dev/sdd": {
"Avail": "874G",
"Used": "83G",
"Size": "1007G",
"Filesystem": "/dev/sdd",
"Mounted_on": "/",
"Use_percentage": "9",
},
"none": {
"Avail": "7.7G",
"Used": "0",
"Size": "7.7G",
"Filesystem": "none",
"Mounted_on": "/usr/lib/wsl/lib",
"Use_percentage": "0",
},
"rootfs": {
"Avail": "7.7G",
"Used": "2.8M",
"Size": "7.7G",
"Filesystem": "rootfs",
"Mounted_on": "/init",
"Use_percentage": "1",
},
},
"by_MOUNTPOINT": {
"/usr/lib/modules/6.6.114.1-microsoft-standard-WSL2": {
"Avail": "7.7G",
"Used": "0",
"Size": "7.7G",
"Filesystem": "none",
"Mounted_on": "/usr/lib/modules/6.6.114.1-microsoft-standard-WSL2",
"Use_percentage": "0",
},
"/mnt/wsl": {
"Avail": "7.7G",
"Used": "4.0K",
"Size": "7.7G",
"Filesystem": "none",
"Mounted_on": "/mnt/wsl",
"Use_percentage": "1",
},
"/usr/lib/wsl/drivers": {
"Avail": "311G",
"Used": "643G",
"Size": "953G",
"Filesystem": "drivers",
"Mounted_on": "/usr/lib/wsl/drivers",
"Use_percentage": "68",
},
"/usr/lib/wsl/lib": {
"Avail": "7.7G",
"Used": "0",
"Size": "7.7G",
"Filesystem": "none",
"Mounted_on": "/usr/lib/wsl/lib",
"Use_percentage": "0",
},
"/": {
"Avail": "874G",
"Used": "83G",
"Size": "1007G",
"Filesystem": "/dev/sdd",
"Mounted_on": "/",
"Use_percentage": "9",
},
"/mnt/wslg": {
"Avail": "7.7G",
"Used": "48K",
"Size": "7.7G",
"Filesystem": "none",
"Mounted_on": "/mnt/wslg",
"Use_percentage": "1",
},
"/init": {
"Avail": "7.7G",
"Used": "2.8M",
"Size": "7.7G",
"Filesystem": "rootfs",
"Mounted_on": "/init",
"Use_percentage": "1",
},
},
}
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name='moler',
version='4.10.1',
version='4.11.0',
description='Moler is a library for working with terminals, mainly for automated tests', # Required
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down
Loading